--- a/i18n/eric5_ru.ts Sun Mar 30 22:00:14 2014 +0200 +++ b/i18n/eric5_ru.ts Thu Apr 03 23:05:31 2014 +0200 @@ -469,29 +469,29 @@ <context> <name>AddDirectoryDialog</name> <message> - <location filename="../Project/AddDirectoryDialog.py" line="107"/> + <location filename="../Project/AddDirectoryDialog.py" line="114"/> <source>Select directory</source> <translation>Выберите каталог</translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.ui" line="13"/> + <location filename="../Project/AddDirectoryDialog.ui" line="14"/> <source>Add Directory</source> <translation>Добавить каталог</translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.ui" line="16"/> + <location filename="../Project/AddDirectoryDialog.ui" line="17"/> <source>Add a directory to the current project</source> <translation>Добавить каталог в текущий проект</translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.ui" line="19"/> + <location filename="../Project/AddDirectoryDialog.ui" line="20"/> <source><b>Add Directory Dialog</b> <p>This dialog is used to add a directory to the current project.</p></source> <translation><b>Диалог добавления каталога</b> <p>Этот диалог используется для добавления каталога в текущий проект.</p></translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.ui" line="34"/> + <location filename="../Project/AddDirectoryDialog.ui" line="108"/> <source><b>Target Directory</b> <p>Select the target directory via a directory selection dialog.</p></source> <translation><b>Каталог назначенияy</b> @@ -500,20 +500,20 @@ <message> <location filename="../Project/AddDirectoryDialog.ui" line="94"/> <source>...</source> - <translation>...</translation> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Project/AddDirectoryDialog.ui" line="35"/> + <source>&Target Directory:</source> + <translation>Каталог &назначения:</translation> </message> <message> <location filename="../Project/AddDirectoryDialog.ui" line="45"/> - <source>&Target Directory:</source> - <translation>Каталог &назначения:</translation> - </message> - <message> - <location filename="../Project/AddDirectoryDialog.ui" line="55"/> <source>Enter the name of the directory to add</source> <translation>Введите имя добавляемого каталога</translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.ui" line="58"/> + <location filename="../Project/AddDirectoryDialog.ui" line="48"/> <source><b>Source Directory</b> <p>Enter the name of the directory to add to the current project. You may select it with a dialog by pressing the button to @@ -523,22 +523,22 @@ Вы можете это сделать, нажав кнопку справа.</p></translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.ui" line="68"/> + <location filename="../Project/AddDirectoryDialog.ui" line="58"/> <source>Select, whether a recursive add should be performed</source> <translation>Выберите, следует ли просматривать вложенные каталоги</translation> </message> <message> + <location filename="../Project/AddDirectoryDialog.ui" line="61"/> + <source>&Recurse into subdirectories</source> + <translation>&Просматривать вложенные каталоги</translation> + </message> + <message> + <location filename="../Project/AddDirectoryDialog.ui" line="68"/> + <source>Enter the target directory for the file</source> + <translation>Введите имя каталога назначения для файла</translation> + </message> + <message> <location filename="../Project/AddDirectoryDialog.ui" line="71"/> - <source>&Recurse into subdirectories</source> - <translation>&Просматривать вложенные каталоги</translation> - </message> - <message> - <location filename="../Project/AddDirectoryDialog.ui" line="78"/> - <source>Enter the target directory for the file</source> - <translation>Введите имя каталога назначения для файла</translation> - </message> - <message> - <location filename="../Project/AddDirectoryDialog.ui" line="81"/> <source><b>Target Directory</b> <p>Enter the target directory. You may select it with a dialog by pressing the button to the right.</p></source> @@ -547,44 +547,44 @@ его с помощью диалога, нажав кнопку справа.</p></translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.ui" line="90"/> + <location filename="../Project/AddDirectoryDialog.ui" line="100"/> <source><b>Source Directory</b> <p>Select the source directory via a directory selection dialog.</p></source> <translation><b>Исходный каталог</b> <p>Выберите исходный каталог с помощью диалога выбора каталога.</p></translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.ui" line="101"/> + <location filename="../Project/AddDirectoryDialog.ui" line="80"/> <source>&Source Directory:</source> <translation>&Исходный каталог:</translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.ui" line="111"/> + <location filename="../Project/AddDirectoryDialog.ui" line="90"/> <source>&File Type:</source> <translation>&Тип файла:</translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.py" line="66"/> + <location filename="../Project/AddDirectoryDialog.py" line="70"/> <source>Source Files</source> <translation>Файлы с исходниками</translation> </message> <message> - <location filename="../Project/AddDirectoryDialog.py" line="68"/> - <source>Forms Files</source> - <translation>Файлы с формами</translation> - </message> - <message> <location filename="../Project/AddDirectoryDialog.py" line="72"/> + <source>Forms Files</source> + <translation>Файлы с формами</translation> + </message> + <message> + <location filename="../Project/AddDirectoryDialog.py" line="76"/> <source>Interface Files</source> <translation>Файлы с описаниями интерфейсов</translation> </message> <message> + <location filename="../Project/AddDirectoryDialog.py" line="78"/> + <source>Other Files (*)</source> + <translation>Все файлы(*)</translation> + </message> + <message> <location filename="../Project/AddDirectoryDialog.py" line="74"/> - <source>Other Files (*)</source> - <translation>Все файлы(*)</translation> - </message> - <message> - <location filename="../Project/AddDirectoryDialog.py" line="70"/> <source>Resource Files</source> <translation>Файлы с ресурсами</translation> </message> @@ -592,54 +592,54 @@ <context> <name>AddFileDialog</name> <message> - <location filename="../Project/AddFileDialog.py" line="63"/> + <location filename="../Project/AddFileDialog.py" line="71"/> <source>Select target directory</source> <translation>Выберите каталог назначения</translation> </message> <message> - <location filename="../Project/AddFileDialog.py" line="148"/> + <location filename="../Project/AddFileDialog.py" line="156"/> <source>All Files (*)</source> <translation>Все файлы(*);;</translation> </message> <message> - <location filename="../Project/AddFileDialog.py" line="106"/> - <source>Select Files</source> - <translation>Выбрать файлы</translation> - </message> - <message> <location filename="../Project/AddFileDialog.py" line="114"/> + <source>Select Files</source> + <translation>Выбрать файлы</translation> + </message> + <message> + <location filename="../Project/AddFileDialog.py" line="122"/> <source>Select user-interface files</source> <translation>Выбрать файлы описания пользовательского интерфейса</translation> </message> <message> - <location filename="../Project/AddFileDialog.py" line="130"/> - <source>Select source files</source> - <translation>Выбрать файлы с исходниками</translation> - </message> - <message> <location filename="../Project/AddFileDialog.py" line="138"/> + <source>Select source files</source> + <translation>Выбрать файлы с исходниками</translation> + </message> + <message> + <location filename="../Project/AddFileDialog.py" line="146"/> <source>Select interface files</source> <translation>Выбрать файлы описания интерфейсов</translation> </message> <message> - <location filename="../Project/AddFileDialog.py" line="149"/> + <location filename="../Project/AddFileDialog.py" line="157"/> <source>Select files</source> <translation>Выбрать файлы</translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="13"/> + <location filename="../Project/AddFileDialog.ui" line="14"/> <source>Add Files</source> <translation>Добавить файлы</translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="16"/> + <location filename="../Project/AddFileDialog.ui" line="17"/> <source><b>Add Files Dialog</b> <p>This dialog is used to add files to the current project.</p></source> <translation><b>Диалог добавления файлов</b> <p>Этот диалог используется для добавления файлов в текущий проект.</p></translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="28"/> + <location filename="../Project/AddFileDialog.ui" line="74"/> <source><b>Source Files</b> <p>Select the source files via a files selection dialog.</p></source> <translation><b>Файлы с исходниками</b> @@ -648,20 +648,20 @@ <message> <location filename="../Project/AddFileDialog.ui" line="65"/> <source>...</source> - <translation>...</translation> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Project/AddFileDialog.ui" line="29"/> + <source>&Target Directory:</source> + <translation>Каталог &назначения:</translation> </message> <message> <location filename="../Project/AddFileDialog.ui" line="39"/> - <source>&Target Directory:</source> - <translation>Каталог &назначения:</translation> - </message> - <message> - <location filename="../Project/AddFileDialog.ui" line="49"/> <source>Enter the target directory for the file</source> <translation>Введите имя каталога назначения для файла</translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="52"/> + <location filename="../Project/AddFileDialog.ui" line="42"/> <source><b>Target Directory</b> <p>Enter the target directory. You may select it with a dialog by pressing the button to the right.</p></source> @@ -670,24 +670,24 @@ его с помощью диалога, нажав кнопку справа.</p></translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="61"/> + <location filename="../Project/AddFileDialog.ui" line="82"/> <source><b>Target Directory</b> <p>Select the target directory via a directory selection dialog.</p></source> <translation><b>Каталог назначенияy</b> <p>Выберите каталог назначения с помощью диалога.</p></translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="72"/> + <location filename="../Project/AddFileDialog.ui" line="51"/> <source>&Source Files:</source> <translation>Файлы с &исходниками:</translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="82"/> + <location filename="../Project/AddFileDialog.ui" line="61"/> <source>Enter the name of files to add separated by the path separator</source> <translation>Задайте имена файлов для добавления, разделённые символом разделения элементов пути</translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="85"/> + <location filename="../Project/AddFileDialog.ui" line="64"/> <source><b>Source Files</b> <p>Enter the name of files to add to the current project separated by the path separator. You may select them with a dialog by pressing @@ -698,57 +698,57 @@ кнопку справа</p></translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="97"/> + <location filename="../Project/AddFileDialog.ui" line="92"/> <source>Select, if the files should be added as sourcecode (overriding automatic detection)</source> <translation>Файлы должны быть добавлены как исходники (вопреки автоматическому определению)</translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="100"/> + <location filename="../Project/AddFileDialog.ui" line="95"/> <source>Is source&code files</source> <translation>Это файлы с &исходниками</translation> </message> <message> - <location filename="../Project/AddFileDialog.ui" line="103"/> + <location filename="../Project/AddFileDialog.ui" line="98"/> <source>Alt+C</source> <translation>Alt+C</translation> </message> <message> - <location filename="../Project/AddFileDialog.py" line="122"/> + <location filename="../Project/AddFileDialog.py" line="130"/> <source>Select resource files</source> <translation>Выбрать файлы с ресурсами</translation> </message> <message> - <location filename="../Project/AddFileDialog.py" line="146"/> + <location filename="../Project/AddFileDialog.py" line="154"/> <source>Select translation files</source> <translation>Выберите файлы переводов</translation> </message> <message> - <location filename="../Project/AddFileDialog.py" line="112"/> - <source>Forms Files ({0})</source> - <translation>Файлы с формами ({0})</translation> - </message> - <message> <location filename="../Project/AddFileDialog.py" line="120"/> - <source>Resource Files ({0})</source> - <translation>Файлы с ресурсами ({0})</translation> + <source>Forms Files ({0})</source> + <translation>Файлы с формами ({0})</translation> </message> <message> <location filename="../Project/AddFileDialog.py" line="128"/> - <source>Source Files ({0});;All Files (*)</source> - <translation>Файлы с исходниками ({0});;Все файлы (*)</translation> + <source>Resource Files ({0})</source> + <translation>Файлы с ресурсами ({0})</translation> </message> <message> <location filename="../Project/AddFileDialog.py" line="136"/> - <source>Interface Files ({0})</source> - <translation>Файлы с описаниями интерфейсов ({0})</translation> + <source>Source Files ({0});;All Files (*)</source> + <translation>Файлы с исходниками ({0});;Все файлы (*)</translation> </message> <message> <location filename="../Project/AddFileDialog.py" line="144"/> + <source>Interface Files ({0})</source> + <translation>Файлы с описаниями интерфейсов ({0})</translation> + </message> + <message> + <location filename="../Project/AddFileDialog.py" line="152"/> <source>Translation Files ({0})</source> <translation>Файлы переводов ({0})</translation> </message> <message> - <location filename="../Project/AddFileDialog.py" line="93"/> + <location filename="../Project/AddFileDialog.py" line="101"/> <source>Source Files ({0});;Forms Files ({1});;Resource Files ({2});;Interface Files ({3});;Translation Files ({4});;All Files (*)</source> <translation>Файлы исходных текстов ({0});;Файлы форм ({1});;Файлы ресурсов ({2});;Файлы интерфейсов ({3});;Файлы переводов ({4});;Все файлы (*)</translation> </message> @@ -1126,42 +1126,42 @@ <context> <name>AddProjectDialog</name> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="62"/> + <location filename="../MultiProject/AddProjectDialog.py" line="75"/> <source>Add Project</source> <translation>Добавить проект</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="25"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="23"/> <source>&Name:</source> <translation>&Имя:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="35"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="33"/> <source>Enter the name of the project</source> <translation>Введите название проекта</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="42"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="40"/> <source>Project&file:</source> <translation>&Файл проекта:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="52"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="50"/> <source>Enter the name of the project file</source> <translation>Введите название проекта</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="59"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="57"/> <source>Select the project file via a file selection dialog</source> <translation>Выберите файл проекта с помощью файлового диалога</translation> </message> <message> <location filename="../MultiProject/AddProjectDialog.ui" line="62"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="82"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../MultiProject/AddProjectDialog.ui" line="77"/> <source>Enter a short description for the project</source> <translation>Введите краткое описание проекта</translation> </message> @@ -1176,30 +1176,40 @@ <translation type="obsolete">Это &главный проект</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="69"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="64"/> <source>&Description:</source> <translation>&Описание:</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="44"/> + <location filename="../MultiProject/AddProjectDialog.py" line="53"/> <source>Project Properties</source> <translation>Свойства проекта</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.py" line="62"/> + <location filename="../MultiProject/AddProjectDialog.py" line="75"/> <source>Project Files (*.e4p)</source> <translation>Файлы проектов (*.e4p)</translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="95"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="110"/> <source>Select to make this project the main project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../MultiProject/AddProjectDialog.ui" line="98"/> + <location filename="../MultiProject/AddProjectDialog.ui" line="113"/> <source>Is &main project</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MultiProject/AddProjectDialog.ui" line="90"/> + <source>&Category:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/AddProjectDialog.ui" line="100"/> + <source>Select a project category</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ApplicationDiagram</name> @@ -1565,143 +1575,143 @@ <context> <name>BookmarkedFilesDialog</name> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="13"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="14"/> <source>Configure Bookmarked Files Menu</source> <translation>Настроить меню закладок на файлы</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="34"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="35"/> <source>Delete the selected entry</source> <translation>Удалить выбранный элемент</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="37"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="38"/> <source><b>Delete</b> <p>Delete the selected entry.</p></source> <translation><b>Удалить</b> <p>Удалить выбранный элемент.</p></translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="41"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="42"/> <source>&Delete</source> <translation>&Удалить</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="114"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="101"/> <source>Alt+D</source> <translation>Alt+D</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="70"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="71"/> <source>Move up</source> <translation>Сдвинуть вверх</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="73"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="74"/> <source><b>Move Up</b> <p>Move the selected entry up.</p></source> <translation><b>Сдвинуть вверх</b> <p>Сдвинуть вверх выбранный элемент.</p></translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="77"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="78"/> <source>&Up</source> <translation>&Выше</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="80"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="81"/> <source>Alt+U</source> <translation>Alt+U</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="87"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="169"/> <source>Select the file via a file selection dialog</source> <translation>Выбрать файл с помощью файлового диалога</translation> </message> <message> <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="94"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="104"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="91"/> <source>Move down</source> <translation>Сдвинуть вниз</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="107"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="94"/> <source><b>Move Down</b> <p>Move the selected entry down.</p></source> <translation><b>Сдвинуть вниз</b> <p>Сдвинуть вниз выбранный элемент.</p></translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="111"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="98"/> <source>&Down</source> <translation>&Ниже</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="124"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="111"/> <source>Add a new bookmarked file</source> <translation>Добавить новый файл в закладки</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="127"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="114"/> <source><b>Add</b> <p>Add a new bookmarked file with the value entered below.</p></source> <translation><b>Добавить</b> <p>Добавить в закладки файл, имя которого задано ниже.</p></translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="131"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="118"/> <source>&Add</source> <translation>&Добавить</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="134"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="121"/> <source>Alt+A</source> <translation>Alt+A</translation> </message> <message> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="128"/> + <source>&File:</source> + <translation>&Файл:</translation> + </message> + <message> <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="141"/> - <source>&File:</source> - <translation>&Файл:</translation> - </message> - <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="154"/> <source>Change the value of the selected entry</source> <translation>Изменить значение выбранной закладки</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="157"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="144"/> <source><b>Change</b> <p>Change the value of the selected entry.</p></source> <translation><b>Правка</b> <p>Изменить значение выбранной закладки.</p></translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="161"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="148"/> <source>C&hange</source> <translation>&Изменить</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="164"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="151"/> <source>Alt+H</source> <translation>Alt+H</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="171"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="158"/> <source>Enter the filename of the file</source> <translation>Введите имя файла</translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="90"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="172"/> <source><b>File</b> <p>Select the file to be bookmarked via a file selection dialog.</p></source> <translation><b>Файл</b><p>Задайте файл, который необходимо сохранить в закладках, с помощью файлового диалога.</p></translation> </message> <message> - <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="174"/> + <location filename="../ViewManager/BookmarkedFilesDialog.ui" line="161"/> <source><b>File</b> <p>Enter the filename of the bookmarked file.</p></source> <translation><b>Файл</b><p>Задайте имя файла, который необходимо добавить в закладки.</p></translation> @@ -1710,62 +1720,62 @@ <context> <name>Bookmarks</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="122"/> <source>Mercurial Bookmark</source> <translation>Mercurial закладка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> <source>Delete Bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="146"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="140"/> <source>Select the bookmark to be deleted:</source> <translation>Выберите закладку, которая будет удалена:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="158"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="151"/> <source>Delete Mercurial Bookmark</source> <translation>Удалить Mercurial закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="179"/> <source>Rename Mercurial Bookmark</source> <translation>Переименовать Mercurial закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="221"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="212"/> <source>Move Mercurial Bookmark</source> <translation>Переместить Mercurial закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="297"/> <source>Pull Bookmark</source> <translation>Тянуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="309"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="297"/> <source>Select the bookmark to be pulled:</source> <translation>Выберите закладку, для перетаскивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="321"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="308"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Загрузка закладки из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="330"/> <source>Push Bookmark</source> <translation>Протолкнуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="343"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="330"/> <source>Select the bookmark to be push:</source> <translation>Выберите закладку, для проталкивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/bookmarks.py" line="341"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Проталкивание закладки в удалённый репозиторий</translation> </message> @@ -1846,12 +1856,12 @@ <translation>Импортировать закладки</translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="36"/> + <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="48"/> <source>Choose source from which you want to import bookmarks:</source> <translation>Выберете исходники из которых вы хотите импортировать закладки:</translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="43"/> + <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="55"/> <source>Choose the source to import from</source> <translation>Выберете исходники для импорта из</translation> </message> @@ -1861,42 +1871,42 @@ <translation type="obsolete">Далее</translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="179"/> + <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="196"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.py" line="89"/> + <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.py" line="92"/> <source>Choose Directory ...</source> <translation>Выбрать каталог ...</translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.py" line="99"/> + <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.py" line="102"/> <source>Choose File ...</source> <translation>Выбрать файл ...</translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.py" line="124"/> + <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.py" line="127"/> <source><b>Importing from {0}</b></source> <translation><b>Импортирование из: {0}</b></translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.py" line="131"/> + <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.py" line="134"/> <source>Finish</source> <translation>Закончить</translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.py" line="146"/> + <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.py" line="149"/> <source>Error importing bookmarks</source> <translation>Ошибка импорта закладок</translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="124"/> + <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="145"/> <source>Shows the name of the bookmarks file or directory</source> <translation>Показать имя закладок файлов или папок</translation> </message> <message> - <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="172"/> + <location filename="../Helpviewer/Bookmarks/BookmarksImportDialog.ui" line="189"/> <source>Next ></source> <translation>Далее ></translation> </message> @@ -2269,7 +2279,7 @@ <translation><b>Протолкнуть закладки</b><p>Протолкнуть закладку из локального репозитория в удалённый репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/ProjectHelper.py" line="219"/> <source>Bookmarks</source> <translation>Закладки</translation> </message> @@ -2517,22 +2527,22 @@ <context> <name>BrowserModel</name> <message> - <location filename="../UI/BrowserModel.py" line="53"/> + <location filename="../UI/BrowserModel.py" line="57"/> <source>Name</source> <translation>Имя</translation> </message> <message> + <location filename="../UI/BrowserModel.py" line="676"/> + <source>Attributes</source> + <translation>Атрибуты</translation> + </message> + <message> <location filename="../UI/BrowserModel.py" line="626"/> - <source>Attributes</source> - <translation>Атрибуты</translation> - </message> - <message> - <location filename="../UI/BrowserModel.py" line="576"/> <source>Coding: {0}</source> <translation>Кодировка: {0}</translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="582"/> + <location filename="../UI/BrowserModel.py" line="632"/> <source>Globals</source> <translation>Глобальные переменные</translation> </message> @@ -2542,7 +2552,7 @@ <translation type="obsolete">Атрибуты (глобальные)</translation> </message> <message> - <location filename="../UI/BrowserModel.py" line="636"/> + <location filename="../UI/BrowserModel.py" line="686"/> <source>Class Attributes</source> <translation>Атрибуты класса</translation> </message> @@ -2679,52 +2689,52 @@ <context> <name>ChatWidget</name> <message> - <location filename="../Cooperation/ChatWidget.ui" line="54"/> + <location filename="../Cooperation/ChatWidget.ui" line="63"/> <source>Chat</source> <translation>Болтовня</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="29"/> + <location filename="../Cooperation/ChatWidget.ui" line="38"/> <source>Users</source> <translation>Пользователи</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="80"/> + <location filename="../Cooperation/ChatWidget.ui" line="89"/> <source>Press to send the text above</source> <translation>Отправить сообщение</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="83"/> + <location filename="../Cooperation/ChatWidget.ui" line="92"/> <source>Send</source> <translation>Отправить</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="189"/> + <location filename="../Cooperation/ChatWidget.ui" line="186"/> <source>Connection</source> <translation>Соединение</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="197"/> + <location filename="../Cooperation/ChatWidget.ui" line="194"/> <source>Host:</source> <translation>Удалённая машина:</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="277"/> + <location filename="../Cooperation/ChatWidget.ui" line="274"/> <source>Port:</source> <translation>Порт:</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="259"/> + <location filename="../Cooperation/ChatWidget.ui" line="256"/> <source>Shows the connection status</source> <translation>Показывает статус соединения</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="271"/> + <location filename="../Cooperation/ChatWidget.ui" line="268"/> <source>Server</source> <translation>Сервер</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="319"/> + <location filename="../Cooperation/ChatWidget.ui" line="316"/> <source>Shows the status of the server</source> <translation>Показывает статус сервера</translation> </message> @@ -2777,27 +2787,27 @@ <translation>Соединиться</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="96"/> + <location filename="../Cooperation/ChatWidget.ui" line="105"/> <source>Share Editor</source> <translation>Совместить редактор</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="118"/> + <location filename="../Cooperation/ChatWidget.ui" line="127"/> <source>Press to toggle the shared status of the current editor</source> <translation>Переключить совмещение текущего редактора</translation> </message> <message> <location filename="../Cooperation/ChatWidget.ui" line="166"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Cooperation/ChatWidget.ui" line="134"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Cooperation/ChatWidget.ui" line="140"/> <source>Press to start a shared edit</source> <translation>Запустить совмещённый редактор</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="150"/> + <location filename="../Cooperation/ChatWidget.ui" line="153"/> <source>Press to end the edit and send the changes</source> <translation>Завершить редактирование и отослать изменения</translation> </message> @@ -2842,12 +2852,12 @@ <translation><p>Невозможно записать содержание в файл <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="73"/> + <location filename="../Cooperation/ChatWidget.ui" line="82"/> <source>Enter the text to send</source> <translation>Задайте текст для отправки</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="284"/> + <location filename="../Cooperation/ChatWidget.ui" line="281"/> <source>Enter the server port</source> <translation>Введите номер порта сервера</translation> </message> @@ -2867,7 +2877,7 @@ <translation type="obsolete">Очистить хост</translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="230"/> + <location filename="../Cooperation/ChatWidget.ui" line="227"/> <source>Press to clear the hosts list</source> <translation>Очистить список хостов</translation> </message> @@ -2953,7 +2963,7 @@ <translation>Сообщение от <{0}></translation> </message> <message> - <location filename="../Cooperation/ChatWidget.ui" line="210"/> + <location filename="../Cooperation/ChatWidget.ui" line="207"/> <source>Enter the host and port to connect to in the form "host@port"</source> <translation>Задайте адрес соединения в формате "host@port"</translation> </message> @@ -3288,72 +3298,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="37"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="46"/> <source>Exclude Files:</source> <translation type="unfinished">Не включать файлы:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="44"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="53"/> <source>Enter filename patterns of files to be excluded separated by a comma</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="63"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="72"/> <source>Press to start the code style check run</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="66"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="75"/> <source>Start</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="73"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="82"/> <source>Press to fix the selected issues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="76"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="85"/> <source>Fix Selected</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="96"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="105"/> <source>Press to load the default values</source> <translation type="unfinished">Восстановить значения по умолчанию</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="99"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="108"/> <source>Load Defaults</source> <translation type="unfinished">Восстановить значения по умолчанию</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="106"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="115"/> <source>Press to store the current values as defaults</source> <translation type="unfinished">Сохранить текущие значения как значения по умолчанию</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="109"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="118"/> <source>Store Defaults</source> <translation type="unfinished">Сохранить значения по умолчанию</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="116"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="125"/> <source>Press to reset the default values</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="119"/> - <source>Reset Defaults</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="128"/> + <source>Reset Defaults</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="137"/> <source>Exclude Messages:</source> <translation type="unfinished">Не включать сообщения:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="135"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="144"/> <source>Enter message codes or categories to be excluded separated by a comma</source> <translation type="unfinished">Задайте коды сообщений или категорий через запятую которые не включать в проверку</translation> </message> @@ -3365,25 +3375,25 @@ <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="217"/> <source>...</source> - <translation type="unfinished">...</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="152"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="158"/> <source>Included Messages:</source> <translation type="unfinished">Включить сообщения:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="159"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="165"/> <source>Enter message codes or categories to be included separated by a comma</source> <translation type="unfinished">Задайте коды сообщений или категорий через запятую которые включать в проверку</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="176"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="179"/> <source>Fix Issues:</source> <translation type="unfinished">Исправлять автоматически:</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="183"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="186"/> <source>Enter message codes of issues to be fixed automatically (leave empty to fix all)</source> <translation type="unfinished">Задайте коды сообщений через запятую которые исправлять автоматически (если пусто, то исправлять всё)</translation> </message> @@ -3398,57 +3408,57 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="224"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="221"/> <source>Max. Line Length:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="233"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="230"/> <source>Enter the maximum allowed line length (PEP-8: 79 characters)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="267"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="264"/> <source>Docstring Type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="276"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="273"/> <source>Select the rule set for docstrings</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="297"/> + <source>Select to allow hanging closing brackets</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="300"/> - <source>Select to allow hanging closing brackets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="303"/> <source>Allow hanging closing brackets</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="324"/> + <source>Select to repeat each message type</source> + <translation type="unfinished">Повторять однотипные сообщения</translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="327"/> - <source>Select to repeat each message type</source> - <translation type="unfinished">Повторять однотипные сообщения</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="330"/> <source>Repeat messages</source> <translation type="unfinished">Повторять сообщения</translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="337"/> + <source>Select to fix some issues</source> + <translation type="unfinished">Исправлять автоматически</translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="340"/> - <source>Select to fix some issues</source> - <translation type="unfinished">Исправлять автоматически</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="343"/> <source>Fix issues automatically</source> <translation type="unfinished">Исправлять автоматически</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="386"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="383"/> <source><b>Result List</b> <p>This list shows the results of the code style check. Double clicking an entry will open this entry in an editor window and position the cursor at @@ -3456,72 +3466,72 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="402"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="399"/> <source>File/Line</source> <translation type="unfinished">Файл/Строка</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="407"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="404"/> <source>Code</source> <translation type="unfinished">Код</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="412"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="409"/> <source>Message</source> <translation type="unfinished">Сообщение</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="92"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="101"/> <source>PEP-257</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="93"/> - <source>Eric</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="95"/> - <source>Statistics...</source> - <translation type="unfinished">Статистика...</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="97"/> - <source>Press to show some statistics for the last run</source> - <translation type="unfinished">Показать результаты последней проверки</translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="100"/> - <source>Show</source> - <translation type="unfinished">Показать</translation> - </message> - <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="102"/> + <source>Eric</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="104"/> + <source>Statistics...</source> + <translation type="unfinished">Статистика...</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="106"/> + <source>Press to show some statistics for the last run</source> + <translation type="unfinished">Показать результаты последней проверки</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="109"/> + <source>Show</source> + <translation type="unfinished">Показать</translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="111"/> <source>Press to show all files containing an issue</source> <translation type="unfinished">Показать все файлы, содержащие синтаксические ошибки</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="403"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="412"/> <source>Error: {0}</source> <translation type="unfinished">Ошибка: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="883"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="894"/> <source>Fix: {0}</source> <translation type="unfinished">Исправлено: {0}</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="546"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py" line="555"/> <source>No issues found.</source> <translation type="unfinished">Синтаксисические ошибки не найдены.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="433"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="430"/> <source>Shows the progress of the code style check</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="442"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui" line="439"/> <source>%v/%m Files</source> <translation type="unfinished"></translation> </message> @@ -3552,12 +3562,12 @@ <context> <name>CodeStyleCheckerPy2</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py" line="54"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py" line="57"/> <source>Python2 interpreter not configured.</source> <translation type="unfinished">Интерпретатор Python2 не настроен.</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py" line="131"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleChecker.py" line="134"/> <source>Python2 interpreter did not finish within 15s.</source> <translation type="unfinished">Интерпретатор Python2 не завершился в течение 15 секунд.</translation> </message> @@ -3888,7 +3898,7 @@ <context> <name>CodingError</name> <message> - <location filename="../Utilities/__init__.py" line="101"/> + <location filename="../Utilities/__init__.py" line="103"/> <source>The coding '{0}' is wrong for the given text.</source> <translation>Кодировка '{0}' не подходит для выбранного текста.</translation> </message> @@ -3925,12 +3935,12 @@ <context> <name>ColorDialogWizardDialog</name> <message> - <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="67"/> + <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="70"/> <source>QColorDialog Wizard Error</source> <translation>Ошибка Мастера QColorDialog</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="67"/> + <location filename="../Plugins/WizardPlugins/ColorDialogWizard/ColorDialogWizardDialog.py" line="70"/> <source><p>The colour <b>{0}</b> is not valid.</p></source> <translation><p>Некорректный цвет: <b>{0}</b></p></translation> </message> @@ -4218,17 +4228,17 @@ <context> <name>CompareDialog</name> <message> - <location filename="../UI/CompareDialog.py" line="246"/> + <location filename="../UI/CompareDialog.py" line="247"/> <source>Compare Files</source> <translation>Сравнить файлы</translation> </message> <message> - <location filename="../UI/CompareDialog.py" line="441"/> + <location filename="../UI/CompareDialog.py" line="442"/> <source>Select file to compare</source> <translation>Задайте файл для сравнения</translation> </message> <message> - <location filename="../UI/CompareDialog.py" line="246"/> + <location filename="../UI/CompareDialog.py" line="247"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл: <b>{0}</b></p></translation> </message> @@ -4238,97 +4248,97 @@ <translation>Сравнение файлов</translation> </message> <message> - <location filename="../UI/CompareDialog.ui" line="32"/> + <location filename="../UI/CompareDialog.ui" line="41"/> <source>File &1:</source> <translation>Файл: &1:</translation> </message> <message> - <location filename="../UI/CompareDialog.ui" line="42"/> + <location filename="../UI/CompareDialog.ui" line="51"/> <source>Enter the name of the first file</source> <translation>Задайте имя первого файла</translation> </message> <message> - <location filename="../UI/CompareDialog.ui" line="76"/> + <location filename="../UI/CompareDialog.ui" line="82"/> <source>Press to select the file via a file selection dialog</source> <translation>Выберите файл с помощью файлового диалога</translation> </message> <message> <location filename="../UI/CompareDialog.ui" line="79"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../UI/CompareDialog.ui" line="59"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../UI/CompareDialog.ui" line="65"/> <source>File &2:</source> <translation>Файл: &2:</translation> </message> <message> - <location filename="../UI/CompareDialog.ui" line="69"/> + <location filename="../UI/CompareDialog.ui" line="75"/> <source>Enter the name of the second file</source> <translation>Задайте имя второго файла</translation> </message> <message> + <location filename="../UI/CompareDialog.ui" line="230"/> + <source>Alt+S</source> + <translation>Alt+S</translation> + </message> + <message> + <location filename="../UI/CompareDialog.py" line="107"/> + <source>Press to perform the comparison of the two files</source> + <translation>Выполнить сравнение двух файлов</translation> + </message> + <message> + <location filename="../UI/CompareDialog.ui" line="161"/> + <source>Press to move to the previous difference</source> + <translation>Нажмите для перехода к предыдущему различию</translation> + </message> + <message> + <location filename="../UI/CompareDialog.ui" line="171"/> + <source>Press to move to the next difference</source> + <translation>Нажмите для перехода к следующему различию</translation> + </message> + <message> + <location filename="../UI/CompareDialog.ui" line="181"/> + <source>Press to move to the last difference</source> + <translation>Нажмите для перехода к последнему различию</translation> + </message> + <message> + <location filename="../UI/CompareDialog.ui" line="151"/> + <source>Press to move to the first difference</source> + <translation>Нажмите для перехода к первому различию</translation> + </message> + <message> + <location filename="../UI/CompareDialog.py" line="105"/> + <source>Compare</source> + <translation>Сравнить</translation> + </message> + <message> + <location filename="../UI/CompareDialog.py" line="354"/> + <source>Total: {0}</source> + <translation>Итого: {0}</translation> + </message> + <message> + <location filename="../UI/CompareDialog.py" line="356"/> + <source>Changed: {0}</source> + <translation>Изменено: {0}</translation> + </message> + <message> + <location filename="../UI/CompareDialog.py" line="357"/> + <source>Added: {0}</source> + <translation>Добавлено: {0}</translation> + </message> + <message> + <location filename="../UI/CompareDialog.py" line="358"/> + <source>Deleted: {0}</source> + <translation>Удалено: {0}</translation> + </message> + <message> + <location filename="../UI/CompareDialog.ui" line="224"/> + <source>Select, if the horizontal scrollbars should be synchronized</source> + <translation>Должны ли синхронизироваться позиции в файлах</translation> + </message> + <message> <location filename="../UI/CompareDialog.ui" line="227"/> - <source>Alt+S</source> - <translation>Alt+S</translation> - </message> - <message> - <location filename="../UI/CompareDialog.py" line="104"/> - <source>Press to perform the comparison of the two files</source> - <translation>Выполнить сравнение двух файлов</translation> - </message> - <message> - <location filename="../UI/CompareDialog.ui" line="158"/> - <source>Press to move to the previous difference</source> - <translation>Нажмите для перехода к предыдущему различию</translation> - </message> - <message> - <location filename="../UI/CompareDialog.ui" line="168"/> - <source>Press to move to the next difference</source> - <translation>Нажмите для перехода к следующему различию</translation> - </message> - <message> - <location filename="../UI/CompareDialog.ui" line="178"/> - <source>Press to move to the last difference</source> - <translation>Нажмите для перехода к последнему различию</translation> - </message> - <message> - <location filename="../UI/CompareDialog.ui" line="148"/> - <source>Press to move to the first difference</source> - <translation>Нажмите для перехода к первому различию</translation> - </message> - <message> - <location filename="../UI/CompareDialog.py" line="102"/> - <source>Compare</source> - <translation>Сравнить</translation> - </message> - <message> - <location filename="../UI/CompareDialog.py" line="353"/> - <source>Total: {0}</source> - <translation>Итого: {0}</translation> - </message> - <message> - <location filename="../UI/CompareDialog.py" line="355"/> - <source>Changed: {0}</source> - <translation>Изменено: {0}</translation> - </message> - <message> - <location filename="../UI/CompareDialog.py" line="356"/> - <source>Added: {0}</source> - <translation>Добавлено: {0}</translation> - </message> - <message> - <location filename="../UI/CompareDialog.py" line="357"/> - <source>Deleted: {0}</source> - <translation>Удалено: {0}</translation> - </message> - <message> - <location filename="../UI/CompareDialog.ui" line="221"/> - <source>Select, if the horizontal scrollbars should be synchronized</source> - <translation>Должны ли синхронизироваться позиции в файлах</translation> - </message> - <message> - <location filename="../UI/CompareDialog.ui" line="224"/> <source>&Synchronize horizontal scrollbars</source> <translation>&Синхронизировать скроллеры</translation> </message> @@ -5131,37 +5141,37 @@ <context> <name>CorbaPage</name> <message> - <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="36"/> + <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="37"/> <source>IDL Compiler</source> <translation>Компилятор интерфейсов (IDL Compiler)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="42"/> + <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="57"/> <source>Press to select the IDL compiler via a file selection dialog.</source> <translation>Нажмите, чтобы выбрать компилятор интерфейсов с помощью файлового диалога.</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="45"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="52"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="43"/> <source>Enter the path to the IDL compiler.</source> <translation>Задайте путь для компилятора интерфейсов.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="59"/> + <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="50"/> <source><b>Note:</b> Leave this entry empty to use the default value (omniidl or omniidl.exe).</source> <translation><b>Примечание:</b> Оставьте это поле пустым, чтобы использовать значение по умолчанию (omniidl или omniidl.exe).</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="50"/> + <location filename="../Preferences/ConfigurationPages/CorbaPage.py" line="53"/> <source>Select IDL compiler</source> <translation>Выбрать компилятор интерфейсов (IDL Compiler)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="16"/> + <location filename="../Preferences/ConfigurationPages/CorbaPage.ui" line="17"/> <source><b>Configure CORBA support</b></source> <translation><b>Настроить поддержку CORBA</b></translation> </message> @@ -5280,41 +5290,41 @@ <context> <name>DebugServer</name> <message> - <location filename="../Debugger/DebugServer.py" line="1419"/> + <location filename="../Debugger/DebugServer.py" line="1437"/> <source>Passive debug connection received</source> <translation>Принято соединение пассивной отладки</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="1433"/> + <location filename="../Debugger/DebugServer.py" line="1451"/> <source>Passive debug connection closed</source> <translation>Соединение пассивной отладки закрыто</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="153"/> + <location filename="../Debugger/DebugServer.py" line="156"/> <source>created</source> <comment>must be same as in EditWatchpointDialog</comment> <translation>создано</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="155"/> + <location filename="../Debugger/DebugServer.py" line="158"/> <source>changed</source> <comment>must be same as in EditWatchpointDialog</comment> <translation>изменено</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="637"/> + <location filename="../Debugger/DebugServer.py" line="655"/> <source>Connection from illegal host</source> <translation>соединение с запрещённого хоста</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="1239"/> + <location filename="../Debugger/DebugServer.py" line="1257"/> <source> Not connected </source> <translation>Нет соединения</translation> </message> <message> - <location filename="../Debugger/DebugServer.py" line="637"/> + <location filename="../Debugger/DebugServer.py" line="655"/> <source><p>A connection was attempted by the illegal host <b>{0}</b>. Accept this connection?</p></source> <translation><p>Попытка соединения с недопустимого компьютора <b>{0}</b>. Разрешить соединение?</p></translation> </message> @@ -6465,37 +6475,37 @@ <context> <name>DebuggerInterfacePython</name> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="363"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="369"/> <source>Start Debugger</source> <translation>Запустить отладчик</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="363"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="369"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Невозможно запустить отладчик</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="804"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="810"/> <source>Parent Process</source> <translation>Родительский процесс</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="805"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="811"/> <source>Child process</source> <translation>Порожденный процесс</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="806"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="812"/> <source>Client forking</source> <translation>Порождение процесса</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="806"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="812"/> <source>Select the fork branch to follow.</source> <translation>Выберите какой процесс отслеживать - родительский или порожденный.</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython.py" line="159"/> + <location filename="../Debugger/DebuggerInterfacePython.py" line="160"/> <source><p>No Python2 interpreter configured.</p></source> <translation><p>Интерпретатор Python2 не настроен.</p> {2 ?}</translation> </message> @@ -6503,32 +6513,32 @@ <context> <name>DebuggerInterfacePython3</name> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="358"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="363"/> <source>Start Debugger</source> <translation>Запустить отладчик</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="358"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="363"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Невозможно запустить отладчик</p></translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="799"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="804"/> <source>Parent Process</source> <translation>Родительский процесс</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="800"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="805"/> <source>Child process</source> <translation>Порожденный процесс</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="801"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="806"/> <source>Client forking</source> <translation>Порождение процесса</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfacePython3.py" line="801"/> + <location filename="../Debugger/DebuggerInterfacePython3.py" line="806"/> <source>Select the fork branch to follow.</source> <translation>Выберите какой процесс отслеживать - родительский или порожденный.</translation> </message> @@ -6536,30 +6546,35 @@ <context> <name>DebuggerInterfaceRuby</name> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="325"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="339"/> <source>Start Debugger</source> <translation>Запустить отладчик</translation> </message> <message> - <location filename="../Debugger/DebuggerInterfaceRuby.py" line="325"/> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="339"/> <source><p>The debugger backend could not be started.</p></source> <translation><p>Невозможно запустить backend отладчика</p></translation> </message> + <message> + <location filename="../Debugger/DebuggerInterfaceRuby.py" line="150"/> + <source><p>No Ruby interpreter configured.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>DebuggerPropertiesDialog</name> <message> - <location filename="../Project/DebuggerPropertiesDialog.py" line="110"/> + <location filename="../Project/DebuggerPropertiesDialog.py" line="117"/> <source>Select interpreter for Debug Client</source> <translation>Выберите интерпретатор клиента для отладки</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.py" line="126"/> + <location filename="../Project/DebuggerPropertiesDialog.py" line="133"/> <source>All Files (*)</source> <translation>Все файлы(*);;</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.py" line="127"/> + <location filename="../Project/DebuggerPropertiesDialog.py" line="134"/> <source>Select Debug Client</source> <translation>Выбрать клиента для отладки</translation> </message> @@ -6586,45 +6601,45 @@ <message> <location filename="../Project/DebuggerPropertiesDialog.ui" line="65"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="49"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="46"/> <source>Interpreter for Debug Client</source> <translation>Интерпретатор для клиента отладки</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="55"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="52"/> <source>Enter the path of the interpreter to be used by the debug client.</source> <translation>Задайте путь до клиента отладки. Оставьте пустым, чтобы использовать значение по умолчанию.</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="62"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="59"/> <source>Press to select the interpreter via a file selection dialog</source> <translation>Выберите интерпретатор для клиента с помощью диалога выбора файлов</translation> </message> <message> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="69"/> + <source>Environment for Debug Client</source> + <translation>Окружение для клиента Отладчика</translation> + </message> + <message> <location filename="../Project/DebuggerPropertiesDialog.ui" line="75"/> - <source>Environment for Debug Client</source> - <translation>Окружение для клиента Отладчика</translation> - </message> - <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="81"/> <source>Select, if the environment of the debug client should be replaced</source> <translation>Должны ли переменные окружения быть заменены</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="84"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="78"/> <source>Replace Environment</source> <translation>Заменить переменные окружения</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="91"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="85"/> <source>Enter the environment variables to be set.</source> <translation>Задайте, какие переменные окружения надо установить.</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="94"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="88"/> <source><b>Environment</b> <p>Enter the environment variables to be set for the debugger. The individual settings must be separate by whitespace and be given in the form 'var=value'.</p> <p>Example: var1=1 var2="hello world"</p></source> @@ -6633,128 +6648,128 @@ <p>Например: var1=1 var2="hello world"</p></translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="103"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="97"/> <source>Environment:</source> <translation>Переменные окружения:</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="113"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="107"/> <source>Select, if the debugger should be run remotely</source> <translation>Должен ли отладчик выполняться удалённо</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="116"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="110"/> <source>Remote Debugger</source> <translation>Удалённый отладчик</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="125"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="119"/> <source>Select, if path translation for remote debugging should be done</source> <translation>Требуется ли выполнять трансляцию пути для удалённой отладки</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="128"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="122"/> <source>Perform Path Translation</source> <translation>Выполнять преобразование пути</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="137"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="131"/> <source>Local Path:</source> <translation>Локальный путь:</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="144"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="138"/> <source>Enter the local path</source> <translation>Задайте локальный путь</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="151"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="145"/> <source>Enter the remote path</source> <translation>Задайте удалённый путь</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="158"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="152"/> <source>Remote Path:</source> <translation>Удалённый путь:</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="168"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="162"/> <source>Remote Host:</source> <translation>Удалённая машина:</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="175"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="169"/> <source>Enter the remote execution command.</source> <translation>Задайте команду для удалённого исполнения.</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="178"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="172"/> <source><b>Remote Execution</b> <p>Enter the remote execution command (e.g. ssh). This command is used to log into the remote host and execute the remote debugger.</p></source> <translation><b>Удалённое выполнение</b> <p>Задайте команду для удалённого управления (напр. ssh). Эта команда используется для подключения к удалённому компьютеру и для запуска там удалённого отладчика.</p></translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="186"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="180"/> <source>Remote Execution:</source> <translation>Удалённое исполнение:</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="193"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="187"/> <source>Enter the hostname of the remote machine.</source> <translation>Задайте имя удалённой машины.</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="196"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="190"/> <source><b>Remote Host</b> <p>Enter the hostname of the remote machine.</p></source> <translation><b>Удалённый компьютер</b> <p>Задайте имя удалённого компьютера.</p></translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="207"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="201"/> <source>Select, if the debugger should be executed in a console window</source> <translation>Должен ли отладчик запускаться в окне консоли (например, в xterm)</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="210"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="204"/> <source>Console Debugger</source> <translation>Отладчик в консоли</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="219"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="213"/> <source>Console Command:</source> <translation>Команда консоли:</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="226"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="220"/> <source>Enter the console command (e.g. xterm -e)</source> <translation>Задайте команду для консоли (напр. xterm -e)</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="229"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="223"/> <source><b>Console Command</b> <p>Enter the console command (e.g. xterm -e). This command is used to open a command window for the debugger.</p></source> <translation><b>Команда для консоли</b> <p>Задайте команду для консоли (напр. xterm -e). Эта команда используется для открытия командного окна отладчика.</p></translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="243"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="237"/> <source>Redirect stdin/stdout/stderr</source> <translation>Перенаправлять stdin/stdout/stderr</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="250"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="244"/> <source>Select to not set the debug client encoding</source> <translation>Не устанавливать кодировку клиента отладки</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="253"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="247"/> <source>Don't set the encoding of the debug client</source> <translation>Не устанавливать кодировку клиента отладки</translation> </message> <message> - <location filename="../Project/DebuggerPropertiesDialog.ui" line="240"/> + <location filename="../Project/DebuggerPropertiesDialog.ui" line="234"/> <source>Select to redirect stdin, stdout and stderr of the program being debugged to the eric5 IDE</source> <translation>Следует ли перенаправлять потоки stdin, stdout и stderr отлаживаемой программы в eric5</translation> </message> @@ -6784,90 +6799,90 @@ <message> <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="97"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="73"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="70"/> <source>Debug Client Type</source> <translation>Тип клиента для отладки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="84"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="81"/> <source>Enter the path of the Debug Client to be used. Leave empty to use the default.</source> <translation>Задайте путь до клиента отладки. Оставьте пустым, чтобы использовать значение по умолчанию.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="94"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="91"/> <source>Press to select the Debug Client via a file selection dialog</source> <translation>Выбрать клиента с помощью файлового диалога</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="106"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="100"/> <source>Select the standard debug client</source> <translation>Выберите стандартный клиент для отладки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="109"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="103"/> <source>Standard</source> <translation>Стандартный</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="116"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="110"/> <source>Select the custom selected debug client</source> <translation>Выберите своего клиента для отладки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="119"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="113"/> <source>Custom</source> <translation>Свой</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="126"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="120"/> <source>Select the multi threaded debug client</source> <translation>Выберите клиента для толадки многопоточных приложений</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="129"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="123"/> <source>Multi Threaded</source> <translation>Многопоточный</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="133"/> + <source>Source association</source> + <translation>Ассоциации для типа файла</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="139"/> - <source>Source association</source> - <translation>Ассоциации для типа файла</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="145"/> <source>Enter the file extensions to be associated with the Python3 debugger separated by a space. They must not overlap with the ones for Python2.</source> <translation>Введите расширения (через пробел) для ассоциации с отладчиком Python3. Они не должны пересекаться с раширениями ассоциированными с Python2.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="164"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="158"/> <source>Redirect stdin/stdout/stderr</source> <translation>Перенаправлять stdin/stdout/stderr</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="171"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="165"/> <source>Select to not set the debug client encoding</source> <translation>Не устанавливать кодировку клиента отладки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="174"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="168"/> <source>Don't set the encoding of the debug client</source> <translation>Не устанавливать кодировку клиента отладки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.py" line="93"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.py" line="97"/> <source>Select Python interpreter for Debug Client</source> <translation>Выберите интерпретатор Python для клиента для отладки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.py" line="108"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.py" line="112"/> <source>Select Debug Client</source> <translation>Выбрать клиента для отладки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.py" line="108"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.py" line="112"/> <source>Python Files (*.py *.py3)</source> <translation>Python файлы (*.py *.py3)</translation> </message> @@ -6882,7 +6897,7 @@ <translation>Собственный интерпретатор Python</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="161"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPython3Page.ui" line="155"/> <source>Select, to redirect stdin, stdout and stderr of the program being debugged to the eric5 IDE</source> <translation>Следует ли перенаправлять потоки stdin, stdout и stderr отлаживаемой программы в eric5</translation> </message> @@ -6912,75 +6927,75 @@ <message> <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="87"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="63"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="60"/> <source>Debug Client Type</source> <translation>Тип клиента для отладки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="74"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="71"/> <source>Enter the path of the Debug Client to be used. Leave empty to use the default.</source> <translation>Задайте путь до клиента отладки. Оставьте пустым, чтобы использовать значение по умолчанию.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="84"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="81"/> <source>Press to select the Debug Client via a file selection dialog</source> <translation>Выбрать клиента с помощью файлового диалога</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="96"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="90"/> <source>Select the standard debug client</source> <translation>Выберите стандартный клиент для отладки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="99"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="93"/> <source>Standard</source> <translation>Стандартный</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="106"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="100"/> <source>Select the custom selected debug client</source> <translation>Выберите своего клиента для отладки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="109"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="103"/> <source>Custom</source> <translation>Свой</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="116"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="110"/> <source>Select the multi threaded debug client</source> <translation>Выберите клиента для толадки многонитевых приложений</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="119"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="113"/> <source>Multi Threaded</source> <translation>Многонитевый</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="154"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="148"/> <source>Redirect stdin/stdout/stderr</source> <translation>Перенаправлять stdin/stdout/stderr</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="161"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="155"/> <source>Select to not set the debug client encoding</source> <translation>Не устанавливать кодировку клиента отладки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="164"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="158"/> <source>Don't set the encoding of the debug client</source> <translation>Не устанавливать кодировку клиента отладки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.py" line="88"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.py" line="92"/> <source>Select Python interpreter for Debug Client</source> <translation>Выберите интерпретатор Python для клиента для отладки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.py" line="103"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.py" line="107"/> <source>Select Debug Client</source> <translation>Выбрать клиента для отладки</translation> </message> @@ -6990,22 +7005,22 @@ <translation><b>Настроить Отладчик Python</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="129"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="123"/> <source>Source association</source> <translation>Ассоциации для типа файла</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="135"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="129"/> <source>Enter the file extensions to be associated with the Python2 debugger separated by a space. They must not overlap with the ones for Python3.</source> <translation>Введите расширения (через пробел) для ассоциации с отладчиком Python2. Они не должны пересекаться с раширениями ассоциированными с Python3.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="151"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.ui" line="145"/> <source>Select, to redirect stdin, stdout and stderr of the program being debugged to the eric5 IDE</source> <translation>Следует ли перенаправлять потоки stdin, stdout и stderr отлаживаемой программы в eric5</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.py" line="103"/> + <location filename="../Preferences/ConfigurationPages/DebuggerPythonPage.py" line="107"/> <source>Python Files (*.py *.py2)</source> <translation>Python файлы (*.py *.py2)}</translation> </message> @@ -7035,15 +7050,15 @@ <message> <location filename="../Preferences/ConfigurationPages/DebuggerRubyPage.ui" line="53"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/DebuggerRubyPage.ui" line="66"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/DebuggerRubyPage.ui" line="63"/> <source>Redirect stdin/stdout/stderr</source> <translation>Перенаправлять stdin/stdout/stderr</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerRubyPage.py" line="59"/> + <location filename="../Preferences/ConfigurationPages/DebuggerRubyPage.py" line="62"/> <source>Select Ruby interpreter for Debug Client</source> <translation>Выберите интерпретатор Ruby для клиента для отладки</translation> </message> @@ -7053,7 +7068,7 @@ <translation><b>Настроить Отладчик Ruby</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/DebuggerRubyPage.ui" line="63"/> + <location filename="../Preferences/ConfigurationPages/DebuggerRubyPage.ui" line="60"/> <source>Select, to redirect stdin, stdout and stderr of the program being debugged to the eric5 IDE</source> <translation>Следует ли перенаправлять потоки stdin, stdout и stderr отлаживаемой программы в eric5</translation> </message> @@ -7069,32 +7084,32 @@ <context> <name>DiffDialog</name> <message> - <location filename="../UI/DiffDialog.py" line="288"/> + <location filename="../UI/DiffDialog.py" line="292"/> <source>Patch Files (*.diff)</source> <translation>Файлы изменений (*.diff)</translation> </message> <message> - <location filename="../UI/DiffDialog.py" line="324"/> + <location filename="../UI/DiffDialog.py" line="328"/> <source>Save Diff</source> <translation>Сохранить изменения</translation> </message> <message> - <location filename="../UI/DiffDialog.py" line="365"/> + <location filename="../UI/DiffDialog.py" line="369"/> <source>Compare Files</source> <translation>Сравнить файлы</translation> </message> <message> - <location filename="../UI/DiffDialog.py" line="469"/> + <location filename="../UI/DiffDialog.py" line="473"/> <source>There is no difference.</source> <translation>Различий нет.</translation> </message> <message> - <location filename="../UI/DiffDialog.py" line="489"/> + <location filename="../UI/DiffDialog.py" line="493"/> <source>Select file to compare</source> <translation>Задайте файл для сравнения</translation> </message> <message> - <location filename="../UI/DiffDialog.py" line="365"/> + <location filename="../UI/DiffDialog.py" line="369"/> <source><p>The file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл: <b>{0}</b></p></translation> </message> @@ -7114,82 +7129,82 @@ <translation>Задайте имя первого файла</translation> </message> <message> - <location filename="../UI/DiffDialog.ui" line="70"/> + <location filename="../UI/DiffDialog.ui" line="67"/> <source>Press to select the file via a file selection dialog</source> <translation>Выберите файл с помощью файлового диалога</translation> </message> <message> <location filename="../UI/DiffDialog.ui" line="73"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../UI/DiffDialog.ui" line="53"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../UI/DiffDialog.ui" line="50"/> <source>File &2:</source> <translation>Файл: &2:</translation> </message> <message> - <location filename="../UI/DiffDialog.ui" line="63"/> + <location filename="../UI/DiffDialog.ui" line="60"/> <source>Enter the name of the second file</source> <translation>Задайте имя второго файла</translation> </message> <message> + <location filename="../UI/DiffDialog.ui" line="82"/> + <source>Select to generate a unified diff</source> + <translation>Генерировать универсальный вывод (Unified Diff)</translation> + </message> + <message> + <location filename="../UI/DiffDialog.ui" line="85"/> + <source>&Unified Diff</source> + <translation>&Unified Diff</translation> + </message> + <message> <location filename="../UI/DiffDialog.ui" line="88"/> - <source>Select to generate a unified diff</source> - <translation>Генерировать универсальный вывод (Unified Diff)</translation> - </message> - <message> - <location filename="../UI/DiffDialog.ui" line="91"/> - <source>&Unified Diff</source> - <translation>&Unified Diff</translation> - </message> - <message> - <location filename="../UI/DiffDialog.ui" line="94"/> <source>Alt+U</source> <translation>Alt+U</translation> </message> <message> + <location filename="../UI/DiffDialog.ui" line="98"/> + <source>Select to generate a context diff</source> + <translation>Генерировать контекстный вывод (Context Diff)</translation> + </message> + <message> + <location filename="../UI/DiffDialog.ui" line="101"/> + <source>Co&ntext Diff</source> + <translation>Co&ntext Diff</translation> + </message> + <message> <location filename="../UI/DiffDialog.ui" line="104"/> - <source>Select to generate a context diff</source> - <translation>Генерировать контекстный вывод (Context Diff)</translation> - </message> - <message> - <location filename="../UI/DiffDialog.ui" line="107"/> - <source>Co&ntext Diff</source> - <translation>Co&ntext Diff</translation> - </message> - <message> - <location filename="../UI/DiffDialog.ui" line="110"/> <source>Alt+N</source> <translation>Alt+N</translation> </message> <message> - <location filename="../UI/DiffDialog.py" line="218"/> - <source>Press to perform the comparison of the two files</source> - <translation>Выполнить сравнение двух файлов</translation> - </message> - <message> <location filename="../UI/DiffDialog.py" line="222"/> + <source>Press to perform the comparison of the two files</source> + <translation>Выполнить сравнение двух файлов</translation> + </message> + <message> + <location filename="../UI/DiffDialog.py" line="226"/> <source>Save the output to a patch file</source> <translation>Сохранить вывод как файл изменений</translation> </message> <message> - <location filename="../UI/DiffDialog.py" line="324"/> + <location filename="../UI/DiffDialog.py" line="328"/> <source><p>The patch file <b>{0}</b> could not be saved.<br />Reason: {1}</p></source> <translation><p>Невозможно сохранить патч в файл <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> <message> - <location filename="../UI/DiffDialog.py" line="216"/> - <source>Compare</source> - <translation>Сравнить</translation> - </message> - <message> <location filename="../UI/DiffDialog.py" line="220"/> + <source>Compare</source> + <translation>Сравнить</translation> + </message> + <message> + <location filename="../UI/DiffDialog.py" line="224"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../UI/DiffDialog.py" line="305"/> + <location filename="../UI/DiffDialog.py" line="309"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл изменений <b>{0}</b> уже существует. Переписать?</p></translation> </message> @@ -7226,197 +7241,197 @@ <context> <name>DocStyleChecker</name> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="127"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="125"/> <source>module is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="129"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="127"/> <source>public function/method is missing a docstring</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="132"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="130"/> <source>private function/method may be missing a docstring</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="133"/> + <source>public class is missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="135"/> - <source>public class is missing a docstring</source> + <source>private class may be missing a docstring</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="137"/> - <source>private class may be missing a docstring</source> + <source>docstring not surrounded by """</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="139"/> - <source>docstring not surrounded by """</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="141"/> <source>docstring containing \ not surrounded by r"""</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="144"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="142"/> <source>docstring containing unicode character not surrounded by u"""</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="145"/> + <source>one-liner docstring on multiple lines</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="147"/> - <source>one-liner docstring on multiple lines</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="149"/> <source>docstring has wrong indentation</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="190"/> + <source>docstring summary does not end with a period</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="153"/> + <source>docstring summary is not in imperative mood (Does instead of Do)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="157"/> + <source>docstring summary looks like a function's/method's signature</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="160"/> + <source>docstring does not mention the return value type</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="163"/> + <source>function/method docstring is separated by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="166"/> + <source>class docstring is not preceded by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="169"/> + <source>class docstring is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="222"/> + <source>docstring summary is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="175"/> + <source>last paragraph of docstring is not followed by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="179"/> + <source>private function/method is missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="182"/> + <source>private class is missing a docstring</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="184"/> + <source>leading quotes of docstring not on separate line</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="187"/> + <source>trailing quotes of docstring not on separate line</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="192"/> - <source>docstring summary does not end with a period</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="155"/> - <source>docstring summary is not in imperative mood (Does instead of Do)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="159"/> - <source>docstring summary looks like a function's/method's signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="162"/> - <source>docstring does not mention the return value type</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="165"/> - <source>function/method docstring is separated by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="168"/> - <source>class docstring is not preceded by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="171"/> - <source>class docstring is not followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="224"/> - <source>docstring summary is not followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="177"/> - <source>last paragraph of docstring is not followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="181"/> - <source>private function/method is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="184"/> - <source>private class is missing a docstring</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="186"/> - <source>leading quotes of docstring not on separate line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="189"/> - <source>trailing quotes of docstring not on separate line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="194"/> <source>docstring does not contain a @return line but function/method returns something</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="198"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="196"/> <source>docstring contains a @return line but function/method doesn't return anything</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="202"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="200"/> <source>docstring does not contain enough @param/@keyparam lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="205"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="203"/> <source>docstring contains too many @param/@keyparam lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="208"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="206"/> <source>keyword only arguments must be documented with @keyparam lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="211"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="209"/> <source>order of @param/@keyparam lines does not match the function/method signature</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="212"/> + <source>class docstring is preceded by a blank line</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="214"/> - <source>class docstring is preceded by a blank line</source> + <source>class docstring is followed by a blank line</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="216"/> - <source>class docstring is followed by a blank line</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="218"/> <source>function/method docstring is preceded by a blank line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="221"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="219"/> <source>function/method docstring is followed by a blank line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="227"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="225"/> <source>last paragraph of docstring is followed by a blank line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="230"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="228"/> <source>docstring does not contain a @exception line but function/method raises an exception</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="234"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="232"/> <source>docstring contains a @exception line but function/method doesn't raise an exception</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="440"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="438"/> <source>no message for this code defined</source> <translation type="unfinished">сообщение об ошибке не определено</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="239"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="237"/> <source>{0}: {1}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="151"/> + <location filename="../Plugins/CheckerPlugins/CodeStyleChecker/DocStyleChecker.py" line="149"/> <source>docstring does not contain a summary</source> <translation type="unfinished"></translation> </message> @@ -7484,32 +7499,32 @@ <message> <location filename="../Helpviewer/DownloadDialog.ui" line="22"/> <source>Icon</source> - <translation>Иконка</translation> + <translation type="obsolete">Иконка</translation> </message> <message> <location filename="../Helpviewer/DownloadDialog.ui" line="31"/> <source>Filename</source> - <translation>Имя файла</translation> + <translation type="obsolete">Имя файла</translation> </message> <message> <location filename="../Helpviewer/DownloadDialog.ui" line="41"/> <source>Info</source> - <translation>Информация</translation> + <translation type="obsolete">Информация</translation> </message> <message> <location filename="../Helpviewer/DownloadDialog.ui" line="52"/> <source>Select to keep the dialog open when finished</source> - <translation>Сохранить диалог открытым по окончании</translation> + <translation type="obsolete">Сохранить диалог открытым по окончании</translation> </message> <message> <location filename="../Helpviewer/DownloadDialog.ui" line="55"/> <source>Keep open when finished</source> - <translation>Сохранить открытым по окончании</translation> + <translation type="obsolete">Сохранить открытым по окончании</translation> </message> <message> <location filename="../Helpviewer/DownloadDialog.ui" line="14"/> <source>Eric5 Download</source> - <translation>Скачивание Eric5</translation> + <translation type="obsolete">Скачивание Eric5</translation> </message> </context> <context> @@ -8373,12 +8388,12 @@ <translation>Заголовки ответов</translation> </message> <message> - <location filename="../E5Network/E5NetworkMonitor.py" line="87"/> + <location filename="../E5Network/E5NetworkMonitor.py" line="86"/> <source>Name</source> <translation>Имя</translation> </message> <message> - <location filename="../E5Network/E5NetworkMonitor.py" line="87"/> + <location filename="../E5Network/E5NetworkMonitor.py" line="86"/> <source>Value</source> <translation>Значение</translation> </message> @@ -8404,42 +8419,42 @@ <context> <name>E5RequestModel</name> <message> - <location filename="../E5Network/E5NetworkMonitor.py" line="221"/> + <location filename="../E5Network/E5NetworkMonitor.py" line="220"/> <source>Method</source> <translation>Метод</translation> </message> <message> + <location filename="../E5Network/E5NetworkMonitor.py" line="221"/> + <source>Address</source> + <translation>Адрес</translation> + </message> + <message> <location filename="../E5Network/E5NetworkMonitor.py" line="222"/> - <source>Address</source> - <translation>Адрес</translation> + <source>Response</source> + <translation>Ответ</translation> </message> <message> <location filename="../E5Network/E5NetworkMonitor.py" line="223"/> - <source>Response</source> - <translation>Ответ</translation> + <source>Length</source> + <translation>Размер</translation> </message> <message> <location filename="../E5Network/E5NetworkMonitor.py" line="224"/> - <source>Length</source> - <translation>Размер</translation> + <source>Content Type</source> + <translation>Тип содержимого</translation> </message> <message> <location filename="../E5Network/E5NetworkMonitor.py" line="225"/> - <source>Content Type</source> - <translation>Тип содержимого</translation> - </message> - <message> - <location filename="../E5Network/E5NetworkMonitor.py" line="226"/> <source>Info</source> <translation>Информация</translation> </message> <message> - <location filename="../E5Network/E5NetworkMonitor.py" line="301"/> + <location filename="../E5Network/E5NetworkMonitor.py" line="300"/> <source>Redirect: {0}</source> <translation>Перенаправить: {0}</translation> </message> <message> - <location filename="../E5Network/E5NetworkMonitor.py" line="334"/> + <location filename="../E5Network/E5NetworkMonitor.py" line="333"/> <source>Unknown</source> <translation>Неизвестный</translation> </message> @@ -8821,56 +8836,56 @@ <translation type="obsolete"><Не является частью сертификата></translation> </message> <message> - <location filename="../E5Network/E5SslInfoWidget.py" line="56"/> + <location filename="../E5Network/E5SslInfoWidget.py" line="55"/> <source>Identity</source> <translation>Идентифицировать</translation> </message> <message> - <location filename="../E5Network/E5SslInfoWidget.py" line="66"/> + <location filename="../E5Network/E5SslInfoWidget.py" line="65"/> <source>Warning: this site is NOT carrying a certificate.</source> <translation>Внимание: этот сайт НЕ содержит сертификат.</translation> </message> <message> - <location filename="../E5Network/E5SslInfoWidget.py" line="80"/> + <location filename="../E5Network/E5SslInfoWidget.py" line="79"/> <source>The certificate for this site is valid and has been verified by: {0}</source> <translation>Серификат для этого сайта действителен и был проверен: {0}</translation> </message> <message> - <location filename="../E5Network/E5SslInfoWidget.py" line="96"/> + <location filename="../E5Network/E5SslInfoWidget.py" line="95"/> <source>Certificate Information</source> <translation>Информация о сертификате</translation> </message> <message> - <location filename="../E5Network/E5SslInfoWidget.py" line="111"/> + <location filename="../E5Network/E5SslInfoWidget.py" line="110"/> <source>Encryption</source> <translation>Исключение</translation> </message> <message> - <location filename="../E5Network/E5SslInfoWidget.py" line="122"/> + <location filename="../E5Network/E5SslInfoWidget.py" line="121"/> <source>Your connection to "{0}" is NOT encrypted. </source> <translation>Ваше соединение к "{0}" НЕ зашифровано. </translation> </message> <message> - <location filename="../E5Network/E5SslInfoWidget.py" line="131"/> + <location filename="../E5Network/E5SslInfoWidget.py" line="130"/> <source>Your connection to "{0}" is encrypted.</source> <translation>Ваше соединение к "{0}" зашифровано.</translation> </message> <message> - <location filename="../E5Network/E5SslInfoWidget.py" line="150"/> + <location filename="../E5Network/E5SslInfoWidget.py" line="149"/> <source>unknown</source> <translation>неизвестный</translation> </message> <message> - <location filename="../E5Network/E5SslInfoWidget.py" line="157"/> + <location filename="../E5Network/E5SslInfoWidget.py" line="156"/> <source>It uses protocol: {0}</source> <translation>Используется протокол:'{0}</translation> </message> <message> - <location filename="../E5Network/E5SslInfoWidget.py" line="164"/> + <location filename="../E5Network/E5SslInfoWidget.py" line="163"/> <source>It is encrypted using {0} at {1} bits, with {2} for message authentication and {3} as key exchange mechanism. </source> @@ -8879,7 +8894,7 @@ </translation> </message> <message> - <location filename="../E5Network/E5SslInfoWidget.py" line="87"/> + <location filename="../E5Network/E5SslInfoWidget.py" line="86"/> <source>The certificate for this site is NOT valid.</source> <translation>Сертификат для этого сайта НЕДЕЙСТВИТЕЛЕН.</translation> </message> @@ -9043,87 +9058,87 @@ <context> <name>EditBreakpointDialog</name> <message> - <location filename="../Debugger/EditBreakpointDialog.py" line="121"/> + <location filename="../Debugger/EditBreakpointDialog.py" line="127"/> <source>Select filename of the breakpoint</source> <translation>Выберите имя файла точки останова</translation> </message> <message> - <location filename="../Debugger/EditBreakpointDialog.ui" line="13"/> + <location filename="../Debugger/EditBreakpointDialog.ui" line="14"/> <source>Edit Breakpoint</source> <translation>Редактировать точку останова</translation> </message> <message> - <location filename="../Debugger/EditBreakpointDialog.ui" line="173"/> + <location filename="../Debugger/EditBreakpointDialog.ui" line="164"/> <source>Ignore Count:</source> <translation>Количество игнорируемых попаданий:</translation> </message> <message> - <location filename="../Debugger/EditBreakpointDialog.ui" line="166"/> + <location filename="../Debugger/EditBreakpointDialog.ui" line="157"/> <source>Condition:</source> <translation>Условие:</translation> </message> <message> - <location filename="../Debugger/EditBreakpointDialog.ui" line="159"/> + <location filename="../Debugger/EditBreakpointDialog.ui" line="150"/> <source>Filename:</source> <translation>Имя файла:</translation> </message> <message> - <location filename="../Debugger/EditBreakpointDialog.ui" line="152"/> + <location filename="../Debugger/EditBreakpointDialog.ui" line="143"/> <source>Linenumber:</source> <translation>Номер строки:</translation> </message> <message> - <location filename="../Debugger/EditBreakpointDialog.ui" line="142"/> + <location filename="../Debugger/EditBreakpointDialog.ui" line="171"/> <source>Press to open a file selection dialog</source> <translation>Открыть диалог выбора файла</translation> </message> <message> <location filename="../Debugger/EditBreakpointDialog.ui" line="145"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Debugger/EditBreakpointDialog.ui" line="113"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Debugger/EditBreakpointDialog.ui" line="114"/> <source>Enter the linenumber of the breakpoint</source> <translation>Задайте номер строки для точки останова</translation> </message> <message> - <location filename="../Debugger/EditBreakpointDialog.ui" line="87"/> + <location filename="../Debugger/EditBreakpointDialog.ui" line="88"/> <source>Enter an ignore count for the breakpoint</source> <translation>Количество игнорируемых попаданий для точки останова</translation> </message> <message> - <location filename="../Debugger/EditBreakpointDialog.ui" line="74"/> + <location filename="../Debugger/EditBreakpointDialog.ui" line="75"/> <source>Enter or select a condition for the breakpoint</source> <translation>Задайте условие точки останова</translation> </message> <message> - <location filename="../Debugger/EditBreakpointDialog.ui" line="55"/> + <location filename="../Debugger/EditBreakpointDialog.ui" line="56"/> <source>Enter the filename of the breakpoint</source> <translation>Выберите имя файла точки останова</translation> </message> <message> - <location filename="../Debugger/EditBreakpointDialog.ui" line="45"/> + <location filename="../Debugger/EditBreakpointDialog.ui" line="46"/> <source>Select whether this is a temporary breakpoint</source> <translation>Задайте, временная ли это точка останова</translation> </message> <message> - <location filename="../Debugger/EditBreakpointDialog.ui" line="48"/> + <location filename="../Debugger/EditBreakpointDialog.ui" line="49"/> <source>Temporary Breakpoint</source> <translation>Временная точки останова</translation> </message> <message> - <location filename="../Debugger/EditBreakpointDialog.ui" line="32"/> + <location filename="../Debugger/EditBreakpointDialog.ui" line="33"/> <source>Select, whether the breakpoint is enabled</source> <translation>Разрешена ли данная точка останова</translation> </message> <message> - <location filename="../Debugger/EditBreakpointDialog.ui" line="35"/> + <location filename="../Debugger/EditBreakpointDialog.ui" line="36"/> <source>Enabled</source> <translation>Разрешена</translation> </message> <message> - <location filename="../Debugger/EditBreakpointDialog.py" line="89"/> + <location filename="../Debugger/EditBreakpointDialog.py" line="92"/> <source>Add Breakpoint</source> <translation>Добавить точку останова</translation> </message> @@ -9204,162 +9219,162 @@ <context> <name>Editor</name> <message> - <location filename="../QScintilla/Editor.py" line="822"/> + <location filename="../QScintilla/Editor.py" line="829"/> <source>Code metrics...</source> <translation>Статистика кода...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="823"/> + <location filename="../QScintilla/Editor.py" line="830"/> <source>Code coverage...</source> <translation>Охват кода...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="831"/> + <location filename="../QScintilla/Editor.py" line="838"/> <source>Profile data...</source> <translation>Данные профайлера...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="626"/> + <location filename="../QScintilla/Editor.py" line="631"/> <source>Undo</source> <translation>Отмена</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="629"/> + <location filename="../QScintilla/Editor.py" line="634"/> <source>Redo</source> <translation>Повтор</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="636"/> + <location filename="../QScintilla/Editor.py" line="641"/> <source>Cut</source> <translation>Вырезать</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="639"/> + <location filename="../QScintilla/Editor.py" line="644"/> <source>Copy</source> <translation>Копировать</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="642"/> - <source>Paste</source> - <translation>Вставить</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="647"/> + <source>Paste</source> + <translation>Вставить</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="652"/> <source>Indent</source> <translation>Увеличить отступ</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="650"/> + <location filename="../QScintilla/Editor.py" line="655"/> <source>Unindent</source> <translation>Уменьшить отступ</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="653"/> + <location filename="../QScintilla/Editor.py" line="658"/> <source>Comment</source> <translation>Закомментировать</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="656"/> + <location filename="../QScintilla/Editor.py" line="661"/> <source>Uncomment</source> <translation>Раскомментировать</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="659"/> + <location filename="../QScintilla/Editor.py" line="664"/> <source>Stream Comment</source> <translation>Поточный комментарий</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="662"/> + <location filename="../QScintilla/Editor.py" line="667"/> <source>Box Comment</source> <translation>Прямоугольный комментарий</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="666"/> + <location filename="../QScintilla/Editor.py" line="671"/> <source>Select to brace</source> <translation>Выбрать до скобки</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="668"/> + <location filename="../QScintilla/Editor.py" line="673"/> <source>Select all</source> <translation>Выбрать всё</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="669"/> + <location filename="../QScintilla/Editor.py" line="674"/> <source>Deselect all</source> <translation>Снять выделение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="800"/> + <location filename="../QScintilla/Editor.py" line="807"/> <source>Check</source> <translation>Проверки</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="820"/> + <location filename="../QScintilla/Editor.py" line="827"/> <source>Show</source> <translation>Показать</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="734"/> + <location filename="../QScintilla/Editor.py" line="739"/> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="738"/> + <location filename="../QScintilla/Editor.py" line="745"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="741"/> + <location filename="../QScintilla/Editor.py" line="748"/> <source>Save As...</source> <translation>Сохранить как...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="754"/> + <location filename="../QScintilla/Editor.py" line="761"/> <source>Print</source> <translation>Печать</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1672"/> + <location filename="../QScintilla/Editor.py" line="1703"/> <source>Modification of Read Only file</source> <translation>Редактирование файла, открытого только на чтение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1672"/> + <location filename="../QScintilla/Editor.py" line="1703"/> <source>You are attempting to change a read only file. Please save to a different file first.</source> <translation>Попытка редактирования файла, открытого только на чтение. Пожалуйста, сначала сохраните изменения в другой файл.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2370"/> + <location filename="../QScintilla/Editor.py" line="2435"/> <source>Printing...</source> <translation>Печать...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2387"/> + <location filename="../QScintilla/Editor.py" line="2452"/> <source>Printing completed</source> <translation>Печать завершена</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2389"/> + <location filename="../QScintilla/Editor.py" line="2454"/> <source>Error while printing</source> <translation>Ошибка печати</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2392"/> + <location filename="../QScintilla/Editor.py" line="2457"/> <source>Printing aborted</source> <translation>Печать отменена</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2763"/> + <location filename="../QScintilla/Editor.py" line="2870"/> <source>Open File</source> <translation>Открыть файл</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2933"/> + <location filename="../QScintilla/Editor.py" line="3040"/> <source>Save File</source> <translation>Сохранить файл</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2714"/> + <location filename="../QScintilla/Editor.py" line="2815"/> <source>File Modified</source> <translation>Файл изменён</translation> </message> @@ -9369,182 +9384,182 @@ <translation type="obsolete"><br><b>Предупреждение:</b> При переоткрытии все изменения будут потеряны.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6000"/> + <location filename="../QScintilla/Editor.py" line="6198"/> <source>File changed</source> <translation>Файл изменён</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="632"/> + <location filename="../QScintilla/Editor.py" line="637"/> <source>Revert to last saved state</source> <translation>Вернуть к последнему записанному состоянию</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="870"/> + <location filename="../QScintilla/Editor.py" line="877"/> <source>Languages</source> <translation>Языки</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1099"/> + <location filename="../QScintilla/Editor.py" line="1123"/> <source>Toggle bookmark</source> <translation>Поставить/убрать закладку</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1101"/> - <source>Next bookmark</source> - <translation>Следующая закладка</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1103"/> - <source>Previous bookmark</source> - <translation>Предыдущая закладка</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1105"/> - <source>Clear all bookmarks</source> - <translation>Стереть все закладки</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1125"/> + <source>Next bookmark</source> + <translation>Следующая закладка</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1127"/> + <source>Previous bookmark</source> + <translation>Предыдущая закладка</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1129"/> + <source>Clear all bookmarks</source> + <translation>Стереть все закладки</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1149"/> <source>Toggle breakpoint</source> <translation>Поставить/убрать точку останова</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1130"/> + <location filename="../QScintilla/Editor.py" line="1154"/> <source>Edit breakpoint...</source> <translation>Редактировать точку останова...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4770"/> + <location filename="../QScintilla/Editor.py" line="4883"/> <source>Enable breakpoint</source> <translation>Разрешить точку останова</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1135"/> - <source>Next breakpoint</source> - <translation>Следующая точка останова</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1137"/> - <source>Previous breakpoint</source> - <translation>Предыдущая точка останова</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1139"/> - <source>Clear all breakpoints</source> - <translation>Убрать все точки останова</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="1159"/> - <source>LMB toggles bookmarks</source> - <translation>Левая клавиша мыши ставит закладки</translation> + <source>Next breakpoint</source> + <translation>Следующая точка останова</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1161"/> + <source>Previous breakpoint</source> + <translation>Предыдущая точка останова</translation> </message> <message> <location filename="../QScintilla/Editor.py" line="1163"/> + <source>Clear all breakpoints</source> + <translation>Убрать все точки останова</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1183"/> + <source>LMB toggles bookmarks</source> + <translation>Левая клавиша мыши ставит закладки</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1187"/> <source>LMB toggles breakpoints</source> <translation>Левая клавиша мыши ставит точки останова</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4773"/> + <location filename="../QScintilla/Editor.py" line="4886"/> <source>Disable breakpoint</source> <translation>Запретить точку останова</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5127"/> + <location filename="../QScintilla/Editor.py" line="5271"/> <source>Code Coverage</source> <translation>Охват кода</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5127"/> + <location filename="../QScintilla/Editor.py" line="5271"/> <source>Please select a coverage file</source> <translation>Пожалуйста, выберите файл для информации охвата</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5725"/> + <location filename="../QScintilla/Editor.py" line="5923"/> <source>Macro Name</source> <translation>Имя макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5725"/> + <location filename="../QScintilla/Editor.py" line="5923"/> <source>Select a macro name:</source> <translation>Задайте имя макроса:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5796"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Macro files (*.macro)</source> <translation>Макросы (*.macro)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5753"/> + <location filename="../QScintilla/Editor.py" line="5951"/> <source>Load macro file</source> <translation>Загрузить макрос</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5776"/> + <location filename="../QScintilla/Editor.py" line="5974"/> <source>Error loading macro</source> <translation>Ошибка при загрузке макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5796"/> + <location filename="../QScintilla/Editor.py" line="5994"/> <source>Save macro file</source> <translation>Сохранить файл с макросами</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5813"/> + <location filename="../QScintilla/Editor.py" line="6011"/> <source>Save macro</source> <translation>Сохранить макрос</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5829"/> + <location filename="../QScintilla/Editor.py" line="6027"/> <source>Error saving macro</source> <translation>Ошибка при сохранении макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5842"/> + <location filename="../QScintilla/Editor.py" line="6040"/> <source>Start Macro Recording</source> <translation>Начало записи макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5868"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>Macro Recording</source> <translation>Запись макроса</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5868"/> + <location filename="../QScintilla/Editor.py" line="6066"/> <source>Enter name of the macro:</source> <translation>Задайте имя макроса:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5288"/> + <location filename="../QScintilla/Editor.py" line="5450"/> <source>Profile Data</source> <translation>Данные профайлера</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5288"/> + <location filename="../QScintilla/Editor.py" line="5450"/> <source>Please select a profile file</source> <translation>Пожалуйста, выберите файл профиля</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="706"/> + <location filename="../QScintilla/Editor.py" line="711"/> <source>Autocompletion enabled</source> <translation>Автозавершение разрешено</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4244"/> + <location filename="../QScintilla/Editor.py" line="4355"/> <source>Autocompletion</source> <translation>Автозавершение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4244"/> + <location filename="../QScintilla/Editor.py" line="4355"/> <source>Autocompletion is not available because there is no autocompletion source set.</source> <translation>Автозавершение недоступно, так как не задан источник автозавершения.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="690"/> + <location filename="../QScintilla/Editor.py" line="695"/> <source>Use Monospaced Font</source> <translation>Использовать моноширинный шрифт</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="683"/> + <location filename="../QScintilla/Editor.py" line="688"/> <source>Shorten empty lines</source> <translation>Укоротить пустые строки</translation> </message> @@ -9554,102 +9569,102 @@ <translation type="obsolete">Новый вид</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1108"/> + <location filename="../QScintilla/Editor.py" line="1132"/> <source>Goto syntax error</source> <translation>Перейти к синтаксической ошибке</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1112"/> + <location filename="../QScintilla/Editor.py" line="1136"/> <source>Clear syntax error</source> <translation>Очистить синтаксическую ошибку</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="695"/> + <location filename="../QScintilla/Editor.py" line="700"/> <source>Autosave enabled</source> <translation>Автосохранение разрешено</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6272"/> + <location filename="../QScintilla/Editor.py" line="6496"/> <source>Drop Error</source> <translation>Ошибка Drag&&Drop</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1110"/> + <location filename="../QScintilla/Editor.py" line="1134"/> <source>Show syntax error message</source> <translation>Показать сообщение о синтаксической ошибке</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5431"/> + <location filename="../QScintilla/Editor.py" line="5610"/> <source>Syntax Error</source> <translation>Синтаксическая ошибка</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5431"/> + <location filename="../QScintilla/Editor.py" line="5610"/> <source>No syntax error message available.</source> <translation>Нет сообщения о синтаксической ошибке.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1127"/> + <location filename="../QScintilla/Editor.py" line="1151"/> <source>Toggle temporary breakpoint</source> <translation>Установить/удалить временную точку останова</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="825"/> + <location filename="../QScintilla/Editor.py" line="832"/> <source>Show code coverage annotations</source> <translation>Показать аннотации по охвату</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="828"/> + <location filename="../QScintilla/Editor.py" line="835"/> <source>Hide code coverage annotations</source> <translation>Не показывать аннотации по охвату</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1142"/> + <location filename="../QScintilla/Editor.py" line="1166"/> <source>Next uncovered line</source> <translation>Следующая неохваченная строка</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1145"/> + <location filename="../QScintilla/Editor.py" line="1169"/> <source>Previous uncovered line</source> <translation>Предыдущая невыполняемая строка</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5190"/> + <location filename="../QScintilla/Editor.py" line="5335"/> <source>Show Code Coverage Annotations</source> <translation>Показать аннотации по охвату</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5183"/> + <location filename="../QScintilla/Editor.py" line="5328"/> <source>All lines have been covered.</source> <translation>Все строки выполняются.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5190"/> + <location filename="../QScintilla/Editor.py" line="5335"/> <source>There is no coverage file available.</source> <translation>Нет файла с информацией по охвату.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2714"/> + <location filename="../QScintilla/Editor.py" line="2815"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>В файле <b>{0}</b> есть несохранённые изменения.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5767"/> + <location filename="../QScintilla/Editor.py" line="5965"/> <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="5776"/> + <location filename="../QScintilla/Editor.py" line="5974"/> <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="5829"/> + <location filename="../QScintilla/Editor.py" line="6027"/> <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="6272"/> + <location filename="../QScintilla/Editor.py" line="6496"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> не является файлом</p></translation> </message> @@ -9659,312 +9674,312 @@ <translation type="obsolete">Новый вид (с новым разделителем)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="319"/> + <location filename="../QScintilla/Editor.py" line="321"/> <source><p>The size of the file <b>{0}</b> is <b>{1} KB</b>. Do you really want to load it?</p></source> <translation><p>Файл <b>{0}</b> занимает <b>{1} KB</b>. Ввы действительно хотите его загрузить?</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="844"/> + <location filename="../QScintilla/Editor.py" line="851"/> <source>Diagrams</source> <translation>Диаграммы</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="846"/> + <location filename="../QScintilla/Editor.py" line="853"/> <source>Class Diagram...</source> <translation>Диаграмма классов...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="848"/> + <location filename="../QScintilla/Editor.py" line="855"/> <source>Package Diagram...</source> <translation>Диаграмма пакетов...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="850"/> + <location filename="../QScintilla/Editor.py" line="857"/> <source>Imports Diagram...</source> <translation>Диаграмма импортирования...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="852"/> + <location filename="../QScintilla/Editor.py" line="859"/> <source>Application Diagram...</source> <translation>Диаграмма приложения...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="873"/> + <location filename="../QScintilla/Editor.py" line="880"/> <source>No Language</source> <translation>Нет языка</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6139"/> + <location filename="../QScintilla/Editor.py" line="6356"/> <source>{0} (ro)</source> <translation>{0} (только чтение)</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6293"/> + <location filename="../QScintilla/Editor.py" line="6517"/> <source>Resources</source> <translation>Ресурсы</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6295"/> + <location filename="../QScintilla/Editor.py" line="6519"/> <source>Add file...</source> <translation>Добавить файл...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6297"/> + <location filename="../QScintilla/Editor.py" line="6521"/> <source>Add files...</source> <translation>Добавить файлы...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6299"/> + <location filename="../QScintilla/Editor.py" line="6523"/> <source>Add aliased file...</source> <translation>Добавить файл под другим именем...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6302"/> + <location filename="../QScintilla/Editor.py" line="6526"/> <source>Add localized resource...</source> <translation>Добавить локализованный ресурс...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6325"/> + <location filename="../QScintilla/Editor.py" line="6549"/> <source>Add file resource</source> <translation>Добавить файл ресурсов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6341"/> + <location filename="../QScintilla/Editor.py" line="6565"/> <source>Add file resources</source> <translation>Добавить файлы ресурсов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6369"/> + <location filename="../QScintilla/Editor.py" line="6593"/> <source>Add aliased file resource</source> <translation>Добавить файл ресурсов под другим именем</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6369"/> + <location filename="../QScintilla/Editor.py" line="6593"/> <source>Alias for file <b>{0}</b>:</source> <translation>Другое имя для файла <b>{0}</b>:</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6433"/> + <location filename="../QScintilla/Editor.py" line="6657"/> <source>Package Diagram</source> <translation>Диаграмма пакетов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6433"/> + <location filename="../QScintilla/Editor.py" line="6657"/> <source>Include class attributes?</source> <translation>Включать атрибуты класса?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6467"/> + <location filename="../QScintilla/Editor.py" line="6691"/> <source>Application Diagram</source> <translation>Диаграмма приложения</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6467"/> + <location filename="../QScintilla/Editor.py" line="6691"/> <source>Include module names?</source> <translation>Включать имена модулей?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6306"/> + <location filename="../QScintilla/Editor.py" line="6530"/> <source>Add resource frame</source> <translation>Добавить фрагмент ресурсов</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5842"/> + <location filename="../QScintilla/Editor.py" line="6040"/> <source>Macro recording is already active. Start new?</source> <translation>Запись макроса уже идёт. Начать новую запись?</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1148"/> + <location filename="../QScintilla/Editor.py" line="1172"/> <source>Next task</source> <translation>Следующая задача</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1150"/> + <location filename="../QScintilla/Editor.py" line="1174"/> <source>Previous task</source> <translation>Предыдущая задача</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="775"/> - <source>Autocomplete</source> - <translation>Автозавершение</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="780"/> - <source>from Document</source> - <translation>из документа</translation> - </message> - <message> <location filename="../QScintilla/Editor.py" line="782"/> + <source>Autocomplete</source> + <translation>Автозавершение</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="787"/> + <source>from Document</source> + <translation>из документа</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="789"/> <source>from APIs</source> <translation>из файлов API</translation> </message> <message> + <location filename="../QScintilla/Editor.py" line="791"/> + <source>from Document and APIs</source> + <translation>Из документа и файлов API</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1000"/> + <source>Export as</source> + <translation>Экспортировать как</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1223"/> + <source>Export source</source> + <translation>Экспортировать исходник</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1215"/> + <source><p>No exporter available for the export format <b>{0}</b>. Aborting...</p></source> + <translation><p>Не найден экспортёр для формата <b>{0}</b>. Отмена...</p></translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="1223"/> + <source>No export format given. Aborting...</source> + <translation>Не задан формат экспорта. Отмена...</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6677"/> + <source>Imports Diagram</source> + <translation>Диаграмма импортов</translation> + </message> + <message> + <location filename="../QScintilla/Editor.py" line="6677"/> + <source>Include imports from external modules?</source> + <translation>Включать импорты из внешних модулей?</translation> + </message> + <message> <location filename="../QScintilla/Editor.py" line="784"/> - <source>from Document and APIs</source> - <translation>Из документа и файлов API</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="976"/> - <source>Export as</source> - <translation>Экспортировать как</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1199"/> - <source>Export source</source> - <translation>Экспортировать исходник</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1191"/> - <source><p>No exporter available for the export format <b>{0}</b>. Aborting...</p></source> - <translation><p>Не найден экспортёр для формата <b>{0}</b>. Отмена...</p></translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="1199"/> - <source>No export format given. Aborting...</source> - <translation>Не задан формат экспорта. Отмена...</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6453"/> - <source>Imports Diagram</source> - <translation>Диаграмма импортов</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="6453"/> - <source>Include imports from external modules?</source> - <translation>Включать импорты из внешних модулей?</translation> - </message> - <message> - <location filename="../QScintilla/Editor.py" line="777"/> <source>dynamic</source> <translation>динамический</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="787"/> + <location filename="../QScintilla/Editor.py" line="794"/> <source>Calltip</source> <translation>Подсказка</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="751"/> + <location filename="../QScintilla/Editor.py" line="758"/> <source>Print Preview</source> <translation>Предварительный просмотр печати</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="373"/> + <location filename="../QScintilla/Editor.py" line="375"/> <source><b>A Source Editor Window</b><p>This window is used to display and edit a source file. You can open as many of these as you like. The name of the file is displayed in the window's titlebar.</p><p>In order to set breakpoints just click in the space between the line numbers and the fold markers. Via the context menu of the margins they may be edited.</p><p>In order to set bookmarks just Shift click in the space between the line numbers and the fold markers.</p><p>These actions can be reversed via the context menu.</p><p>Ctrl clicking on a syntax error marker shows some info about this error.</p></source> <translation><b>Окно редактора</b><p>Это окно используется для просмотра и редактирования исходных текстов приложений. Вы можете открыть несколько окон одновременно. Имя редактируемого файла отображается в заголовке окна.</p><p>Чтобы установить точку останова кликните в пространство между номером строки и меткой свёртки на нужной строке. Появившийся маркер точки останова можно настроить через контекстное меню.</p><p>Чтобы установить закладку кликните в пространство между номером строки и меткой свёртки на нужной строке при нажатой клавише Shift.</p><p>Эти действия можно отменить через контекстное меню.</p><p>Если при нажатой клавише Ctrl кликнуть на маркер синтаксической ошибки, то будет показана дополнительная информация об ошибке.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="699"/> + <location filename="../QScintilla/Editor.py" line="704"/> <source>Typing aids enabled</source> <translation>Разрешить помощь при наборе</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="940"/> + <location filename="../QScintilla/Editor.py" line="964"/> <source>End-of-Line Type</source> <translation>Тип конца строки</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="944"/> + <location filename="../QScintilla/Editor.py" line="968"/> <source>Unix</source> <translation>Unix</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="951"/> + <location filename="../QScintilla/Editor.py" line="975"/> <source>Windows</source> <translation>Windows</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="958"/> + <location filename="../QScintilla/Editor.py" line="982"/> <source>Macintosh</source> <translation>Macintosh</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="916"/> + <location filename="../QScintilla/Editor.py" line="923"/> <source>Encodings</source> <translation>Кодировки</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="896"/> + <location filename="../QScintilla/Editor.py" line="903"/> <source>Guessed</source> <translation>Догадки</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1214"/> + <location filename="../QScintilla/Editor.py" line="1238"/> <source>Alternatives</source> <translation>Альтернативы</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1210"/> + <location filename="../QScintilla/Editor.py" line="1234"/> <source>Alternatives ({0})</source> <translation>Альтернативы ({0})</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1230"/> + <location filename="../QScintilla/Editor.py" line="1254"/> <source>Pygments Lexer</source> <translation></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1230"/> + <location filename="../QScintilla/Editor.py" line="1254"/> <source>Select the Pygments lexer to apply.</source> <translation>Задайте язык лексического анализатора.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6755"/> + <location filename="../QScintilla/Editor.py" line="6979"/> <source>Check spelling...</source> <translation>Проверка орфографии...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="675"/> + <location filename="../QScintilla/Editor.py" line="680"/> <source>Check spelling of selection...</source> <translation>Проверка орфографии подсвеченного участка...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6758"/> + <location filename="../QScintilla/Editor.py" line="6982"/> <source>Add to dictionary</source> <translation>Добавить в слварь</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="6760"/> + <location filename="../QScintilla/Editor.py" line="6984"/> <source>Ignore All</source> <translation>Игнорировать всё</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="679"/> + <location filename="../QScintilla/Editor.py" line="684"/> <source>Remove from dictionary</source> <translation>Удалить из словаря</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2763"/> + <location filename="../QScintilla/Editor.py" line="2870"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>Невозможно прочитать файл <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2866"/> + <location filename="../QScintilla/Editor.py" line="2973"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>Невозможно сохранить файл <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5990"/> + <location filename="../QScintilla/Editor.py" line="6188"/> <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> <message> - <location filename="../QScintilla/Editor.py" line="1115"/> + <location filename="../QScintilla/Editor.py" line="1139"/> <source>Next warning</source> <translation>Следующее предупреждение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1118"/> + <location filename="../QScintilla/Editor.py" line="1142"/> <source>Previous warning</source> <translation>Предыдущее предупреждение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1120"/> + <location filename="../QScintilla/Editor.py" line="1144"/> <source>Show warning message</source> <translation>Показать предупреждение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1122"/> + <location filename="../QScintilla/Editor.py" line="1146"/> <source>Clear warnings</source> <translation>Очистить предупреждения</translation> </message> @@ -9979,240 +9994,245 @@ <translation type="obsolete">py3flakes предупреждений не найдено.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="2933"/> + <location filename="../QScintilla/Editor.py" line="3040"/> <source><p>The 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="5813"/> + <location filename="../QScintilla/Editor.py" line="6011"/> <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="5664"/> + <location filename="../QScintilla/Editor.py" line="5862"/> <source>Warning: {0}</source> <translation>Предупреждение: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5671"/> + <location filename="../QScintilla/Editor.py" line="5869"/> <source>Error: {0}</source> <translation>Ошибка: {0}</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5996"/> + <location filename="../QScintilla/Editor.py" line="6194"/> <source><br><b>Warning:</b> You will lose your changes upon reopening it.</source> <translation><br><b>Предупреждение:</b> При переоткрытии все изменения будут потеряны.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4345"/> + <location filename="../QScintilla/Editor.py" line="4456"/> <source>Activating Auto-Completion Provider</source> <translation>Активация Автозавершения</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4345"/> + <location filename="../QScintilla/Editor.py" line="4456"/> <source>Auto-completion provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>Автозавершение не может быть подключено, потому что уже активны. Пожалуйста проверьте конфигурацию.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4535"/> + <location filename="../QScintilla/Editor.py" line="4646"/> <source>Activating Calltip Provider</source> <translation>Активация подсказок</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="4535"/> + <location filename="../QScintilla/Editor.py" line="4646"/> <source>Calltip provider cannot be connected because there is already another one active. Please check your configuration.</source> <translation>Подсказки не могут быть подключены, потому что уже активны. Пожалуйста проверьте конфигурацию.</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="747"/> + <location filename="../QScintilla/Editor.py" line="754"/> <source>Open 'rejection' file</source> <translation>Открыть 'отбракованный' файл</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="856"/> + <location filename="../QScintilla/Editor.py" line="863"/> <source>Load Diagram...</source> <translation>Загрузить диаграмму...</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1153"/> + <location filename="../QScintilla/Editor.py" line="1177"/> <source>Next change</source> <translation>Следующее изменение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="1156"/> + <location filename="../QScintilla/Editor.py" line="1180"/> <source>Previous change</source> <translation>Предыдущее изменение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7171"/> + <location filename="../QScintilla/Editor.py" line="7395"/> <source>Sort Lines</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="7171"/> + <location filename="../QScintilla/Editor.py" line="7395"/> <source>The selection contains illegal data for a numerical sort.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5600"/> + <location filename="../QScintilla/Editor.py" line="5798"/> <source>Warning</source> <translation type="unfinished">Предупреждение</translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5600"/> + <location filename="../QScintilla/Editor.py" line="5798"/> <source>No warning messages available.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="5661"/> + <location filename="../QScintilla/Editor.py" line="5859"/> <source>Style: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="726"/> + <location filename="../QScintilla/Editor.py" line="731"/> <source>New Document View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="729"/> + <location filename="../QScintilla/Editor.py" line="734"/> <source>New Document View (with new split)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/Editor.py" line="810"/> + <location filename="../QScintilla/Editor.py" line="817"/> <source>Tools</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../QScintilla/Editor.py" line="945"/> + <source>Re-Open With Encoding</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorAPIsPage</name> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="51"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="52"/> <source>Language:</source> <translation>Язык:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="67"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="68"/> <source>Select the language to be configured.</source> <translation>Выберите язык для конфигурации.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="79"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="80"/> <source>APIs</source> <translation>API</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="105"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="106"/> <source>Press to add the entered file to the list</source> <translation>Нажмите кнопку для добавления файла в список</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="108"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="109"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="98"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="99"/> <source>Delete</source> <translation>Удалить</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="122"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="173"/> <source>Press to select an API file via a selection dialog</source> <translation>Выберите файл API с помощью диалога</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="125"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="115"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="116"/> <source>Enter a file to be added</source> <translation>Задайте файл, который надо добавить</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="85"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="86"/> <source>List of API files</source> <translation>Список файлов с API</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="137"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="140"/> <source>Select API file</source> <translation>Выберите файл API</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="137"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="140"/> <source>API File (*.api);;All Files (*)</source> <translation>Файлы API (*.api);;Все файлы (*)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="16"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="17"/> <source><b>Configure API files</b></source> <translation><b>Настроить файлы API</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="36"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="37"/> <source>Select to compile the APIs automatically upon loading</source> <translation>Компилировать файлы API автоматически при запуске</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="39"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="40"/> <source>Compile APIs automatically</source> <translation>Автоматически компилировать файлы API</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="132"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="123"/> <source>Press to select an API file from the list of installed API files</source> <translation>Нажмите для выбора файла API из списка установленных</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="192"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="195"/> <source>Add from installed APIs</source> <translation>Добавить из установленных файлов API</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="159"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="150"/> <source>Press to compile the selected APIs definition</source> <translation>Компилировать выбранные определения API</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="244"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="247"/> <source>Compile APIs</source> <translation>Компилировать API</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="181"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="184"/> <source>Select from the list of installed API files</source> <translation>Выбрать из списка установленных файлов API</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="259"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="262"/> <source>Cancel compilation</source> <translation>Отменить компиляцию</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="95"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="96"/> <source>Press to delete the selected file from the list</source> <translation>Удалить подсвеченный файл из списка</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="142"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="133"/> <source>Press to select an API file from the list of API files installed by plugins</source> <translation>Выбрать подсвеченный файл API из списка установленных</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="211"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="214"/> <source>Add from Plugin APIs</source> <translation>Добавить из API для плагина</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="211"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="214"/> <source>Select from the list of API files installed by plugins</source> <translation>Выбрать из списка установленных файлов API</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="192"/> + <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="195"/> <source>There are no APIs installed yet. Selection is not available.</source> <translation>API не установлено. Выбор не возможен.</translation> </message> @@ -12049,47 +12069,47 @@ <context> <name>EditorSpellCheckingPage</name> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="292"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="295"/> <source>Select to enable spellchecking</source> <translation>Разрешить проверку орфографии</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="108"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="117"/> <source>Select to check strings only</source> <translation>Проверять орфографию только в значениях строк</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="120"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="129"/> <source>Minimum word size:</source> <translation>Минимальный размер слова:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="127"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="136"/> <source>Move to set the minimum size of words to be checked</source> <translation>Минимальный размер слова для проверки орфографии</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="149"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="158"/> <source>Displays the minimum size of words to be checked</source> <translation>Минимальный размер слова для проверки орфографии</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="72"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="81"/> <source>Default language:</source> <translation>Язык по умолчанию:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="79"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="88"/> <source>Select the default language</source> <translation>Язык по умолчанию</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="176"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="185"/> <source>Marker Colour:</source> <translation>Цвет маркера:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="189"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="198"/> <source>Select the colour for the spelling markers.</source> <translation>Цвет для подсветки орфографических ошибок.</translation> </message> @@ -12104,117 +12124,117 @@ <translation><font color="#FF0000">Проверка орфографии при помощи PyEnchant недоступна.</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="66"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="75"/> <source>Defaults</source> <translation>По умолчанию</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="102"/> - <source>Spell checking options</source> - <translation>Параметры проверки орфографии</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="111"/> + <source>Spell checking options</source> + <translation>Параметры проверки орфографии</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="120"/> <source>Spell check strings only</source> <translation>Проверять орфографию только в значениях строк</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="170"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="179"/> <source>Colours</source> <translation>Цвета</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="215"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="224"/> <source>Personal lists</source> <translation>Персональные словари</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="221"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="230"/> <source>Personal word list file:</source> <translation>Файл персонального словаря:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="228"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="237"/> <source>Enter the filename of the personal word list</source> <translation>Файл персонального словаря</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="235"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="272"/> <source>Select the personal word list file via a file selection dialog</source> <translation>Задайте файл персонального словаря с помощью диалога выбора файлов</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="262"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="245"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="244"/> <source>Personal exclude list file:</source> <translation>Файл персонального списка исключений:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="252"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="251"/> <source>Enter the filename of the personal exclude list</source> <translation>Файл персонального списка исключений</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="259"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="279"/> <source>Select the personal exclude list file via a file selection dialog</source> <translation>Задайте файл персонального списка исключений с помощью диалога выбора файлов</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="269"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="258"/> <source><b>Note:</b> leave these entries empty to use the default</source> <translation><b>Примечание:</b> Оставьте это поле пустым, чтобы использовать значение по умолчанию</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="276"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="265"/> <source><b>Note:</b> valid for all newly opened editors</source> <translation><b>Примечание:</b> Действует во вновь открытых окнах редактора</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="286"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="289"/> <source>Automatic spell checking</source> <translation>Автоматическая проверка орфографии</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="295"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="298"/> <source>Automatic spell checking enabled</source> <translation>Автоматическая проверка орфографии разрешена</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="304"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="307"/> <source>Amount of lines to autocheck at once:</source> <translation>Сколько строк проверять за один раз:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="311"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="314"/> <source>Enter the number of lines to check per go. Higher values increase checking speed but decrease GUI responsivenes</source> <translation>Сколько строк проверять за один раз. Чем выше это значение, тем выше скорость проверки но хуже скорость реакции GUI</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.py" line="109"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.py" line="113"/> <source>Select personal word list</source> <translation>Выберите персональный словарь</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.py" line="123"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.py" line="127"/> <source>Select personal exclude list</source> <translation>Выберите персональный файл исключений</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.py" line="123"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.py" line="127"/> <source>Dictionary File (*.dic);;All Files (*)</source> <translation>Файл словаря (*.dic);Все файлы (*)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="56"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="65"/> <source>Select to enable spell checking</source> <translation>Разрешить проверку орфографии</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="59"/> + <location filename="../Preferences/ConfigurationPages/EditorSpellCheckingPage.ui" line="68"/> <source>Spell checking enabled</source> <translation>Проверку орфографии разрешена</translation> </message> @@ -13022,6 +13042,101 @@ <source>Caretline always visible</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1561"/> + <source>Marker Map</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1567"/> + <source>Errors:</source> + <translation type="unfinished">Ошибки:</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1580"/> + <source>Select the colour for error markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1590"/> + <source>Warnings:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1603"/> + <source>Select the colour for warning markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1613"/> + <source>Bookmarks:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1626"/> + <source>Select the colour for bookmark markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1636"/> + <source>Breakpoints:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1649"/> + <source>Select the colour for breakpoint markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1659"/> + <source>Tasks:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1672"/> + <source>Select the colour for task markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1682"/> + <source>Changes:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1695"/> + <source>Select the colour for change markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1705"/> + <source>Coverage:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1718"/> + <source>Select the colour for coverage markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1728"/> + <source>Current Line:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1741"/> + <source>Select the colour for the current line marker</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1751"/> + <source>Background:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1764"/> + <source>Select the background colour for the marker map</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>EditorSyntaxPage</name> @@ -13596,12 +13711,12 @@ <context> <name>EricapiConfigDialog</name> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="183"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="190"/> <source>Select output file</source> <translation>Выберите целевой файл</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="214"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="221"/> <source>Select directory to exclude</source> <translation>Выберите исключаемый каталог</translation> </message> @@ -13616,112 +13731,112 @@ <translation>Задайте имя целевого файла</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="38"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="45"/> <source>Press to open a file selection dialog</source> <translation>Открыть диалог выбора файла</translation> </message> <message> <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="221"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="48"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="35"/> <source>Output File:</source> <translation>Целевой файл:</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="84"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="81"/> <source>Additional source extensions:</source> <translation>Дополнительные расширения для исходников:</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="91"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="88"/> <source>Enter additional source extensions separated by a comma</source> <translation>Задайте дополнительные расширения исходников, разделённых запятой</translation> </message> <message> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="115"/> + <source>Select to recurse into subdirectories</source> + <translation>Обрабатывать вложенные каталоги</translation> + </message> + <message> <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="118"/> - <source>Select to recurse into subdirectories</source> - <translation>Обрабатывать вложенные каталоги</translation> - </message> - <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="121"/> <source>Recurse into subdirectories</source> <translation>С подкаталогами</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="142"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="139"/> <source>Base package name:</source> <translation>Имя основного пакета:</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="149"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="146"/> <source>Enter the name of the base package</source> <translation>Задайте имя основного пакета</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="182"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="179"/> <source>Exclude Directories</source> <translation>Исключить каталоги</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="188"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="185"/> <source>Enter a directory basename to be ignored</source> <translation>Базовое имя игнорируемого каталога</translation> </message> <message> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="192"/> + <source>Press to add the entered directory to the list</source> + <translation>Добавить заданный каталог в список</translation> + </message> + <message> <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="195"/> - <source>Press to add the entered directory to the list</source> - <translation>Добавить заданный каталог в список</translation> - </message> - <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="198"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="208"/> - <source>Delete</source> - <translation>Удалить</translation> - </message> - <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="218"/> - <source>Press to open a directory selection dialog</source> - <translation>Открыть диалог выбора каталога</translation> - </message> - <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="228"/> - <source>List of directory basenames to be ignored</source> - <translation>Список игнорируемых базовых имён каталогов</translation> - </message> - <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="183"/> - <source>API files (*.api);;All files (*)</source> - <translation>Файлы API (*.api);;Все файлы (*)</translation> - </message> - <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="160"/> - <source>Exclude Files:</source> - <translation>Не включать файлы:</translation> - </message> - <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="167"/> - <source>Enter filename patterns of files to be excluded separated by a comma</source> - <translation>Задайте маски файлов для исключения, разделённые запятой</translation> - </message> - <message> <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="205"/> + <source>Delete</source> + <translation>Удалить</translation> + </message> + <message> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="222"/> + <source>Press to open a directory selection dialog</source> + <translation>Открыть диалог выбора каталога</translation> + </message> + <message> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="212"/> + <source>List of directory basenames to be ignored</source> + <translation>Список игнорируемых базовых имён каталогов</translation> + </message> + <message> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.py" line="190"/> + <source>API files (*.api);;All files (*)</source> + <translation>Файлы API (*.api);;Все файлы (*)</translation> + </message> + <message> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="157"/> + <source>Exclude Files:</source> + <translation>Не включать файлы:</translation> + </message> + <message> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="164"/> + <source>Enter filename patterns of files to be excluded separated by a comma</source> + <translation>Задайте маски файлов для исключения, разделённые запятой</translation> + </message> + <message> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="202"/> <source>Press to delete the selected directory from the list</source> <translation>Удалить выбранный каталог из списка</translation> </message> <message> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="125"/> + <source>Select to include private classes, methods and functions in the API file</source> + <translation>Включать приватные классы, методы и функции в файлы API</translation> + </message> + <message> <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="128"/> - <source>Select to include private classes, methods and functions in the API file</source> - <translation>Включать приватные классы, методы и функции в файлы API</translation> - </message> - <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="131"/> <source>Include private classes, methods and functions</source> <translation>Включать приватные классы, методы и функции</translation> </message> @@ -13731,12 +13846,12 @@ <translation><b>Имя выходного файла</b><p>Введите имя файла для вывода. '%L' будет замещено меткой языка.</p></translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="63"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="60"/> <source>Languages</source> <translation>Языки</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="69"/> + <location filename="../Plugins/DocumentationPlugins/Ericapi/EricapiConfigDialog.ui" line="66"/> <source>Select the languages of the APIs to generate</source> <translation>Выберите, на каком языке генерировать API</translation> </message> @@ -13847,337 +13962,337 @@ <context> <name>EricdocConfigDialog</name> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="290"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="299"/> <source>Select output directory</source> <translation>Выберите целевой каталог</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="315"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="324"/> <source>Select directory to exclude</source> <translation>Выберите исключаемый каталог</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="355"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="364"/> <source>Style sheet (*.css);;All files (*)</source> <translation>Стили CSS (*.css);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="355"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="364"/> <source>Select CSS style sheet</source> <translation>Выберите стиль CSS</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="13"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="14"/> <source>Ericdoc Configuration</source> <translation>Конфигурация Ericdoc</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="26"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="27"/> <source>General</source> <translation>Общее</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="398"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="390"/> <source>Enter an output directory</source> <translation>Задайте целевой каталог</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="408"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="400"/> <source>Press to open a directory selection dialog</source> <translation>Открыть диалог выбора каталога</translation> </message> <message> <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="411"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="389"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="381"/> <source>Output Directory:</source> <translation>Целевой каталог:</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="65"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="63"/> <source>Additional source extensions:</source> <translation>Дополнительные расширения для исходников:</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="72"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="70"/> <source>Enter additional source extensions separated by a comma</source> <translation>Задайте дополнительные расширения исходников, разделённых запятой</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="83"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="81"/> <source>Select to recurse into subdirectories</source> <translation>Обрабатывать вложенные каталоги</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="86"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="84"/> <source>Recurse into subdirectories</source> <translation>С подкаталогами</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="93"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="91"/> <source>Select, if no index files should be generated</source> <translation>Не создавать индексы для документации</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="96"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="94"/> <source>Don't generate index files</source> <translation>Не создавать индексы</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="123"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="121"/> <source>Select to exclude empty modules</source> <translation>Не включать пустые модули</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="126"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="124"/> <source>Don't include empty modules</source> <translation>Не включать пустые модули</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="169"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="167"/> <source>Exclude Directories</source> <translation>Исключить каталоги</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="175"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="173"/> <source>Enter a directory basename to be ignored</source> <translation>Базовое имя игнорируемого каталога</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="182"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="180"/> <source>Press to add the entered directory to the list</source> <translation>Добавить заданный каталог в список</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="185"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="183"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="195"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="193"/> <source>Delete</source> <translation>Удалить</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="215"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="200"/> <source>List of directory basenames to be ignored</source> <translation>Список игнорируемых базовых имён каталогов</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="226"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="221"/> <source>Style</source> <translation>Стиль</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="232"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="227"/> <source>Style Sheet</source> <translation>Страница стилей</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="238"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="233"/> <source>Enter the filename of a CSS style sheet. Leave empty to use the colours defined below.</source> <translation>Задайте имя файла с описанием стиля CSS. Оставьте пустым, чтобы использовать цвета, определённые ниже.</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="248"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="243"/> <source>Press to open a file selection dialog</source> <translation>Открыть диалог выбора файла</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="261"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="253"/> <source>Colours</source> <translation>Цвета</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="267"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="259"/> <source>Press to select the class and function header background colour.</source> <translation>Задать цвет фона для класса и заголовка функции.</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="270"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="262"/> <source>Class/Function Header Background</source> <translation>Фон класса/заголовка функции</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="277"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="269"/> <source>Press to select the class and function header foreground colour.</source> <translation>Задать цвет текста для класса и заголовка функции.</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="280"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="272"/> <source>Class/Function Header Foreground</source> <translation>Цвет класса/заголовка функции</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="287"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="279"/> <source>Press to select the level 2 header background colour.</source> <translation>Задать цвет фона для заголовка второго уровня.</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="290"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="282"/> <source>Level 2 Header Background</source> <translation>Фон заголовка 2 уровня</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="297"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="289"/> <source>Press to select the level 2 header foreground colour.</source> <translation>Задать цвет текста для заголовка второго уровня.</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="300"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="292"/> <source>Level 2 Header Foreground</source> <translation>Цвет заголовка 2 уровня</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="307"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="299"/> <source>Press to select the level 1 header background colour.</source> <translation>Задать цвет фона для заголовка первого уровня.</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="310"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="302"/> <source>Level 1 Header Background</source> <translation>Фон заголовка 1 уровня</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="317"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="309"/> <source>Press to select the level 1 header foreground colour.</source> <translation>Задать цвет текста для заголовка 1 уровня.</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="320"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="312"/> <source>Level 1 Header Foreground</source> <translation>Цвет заголовка 1 уровня</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="327"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="319"/> <source>Press to select the body background colour.</source> <translation>Задайте цвет фона для содержимого.</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="330"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="322"/> <source>Body Background</source> <translation>Фон содержимиго</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="337"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="329"/> <source>Press to select the body foreground colour.</source> <translation>Задайте цвет текста для содержимого.</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="340"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="332"/> <source>Body Foreground</source> <translation>Цвет текста для содержимого</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="347"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="339"/> <source>Press to select the foreground colour of links.</source> <translation>Задайте цвет текста для ссылок.</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="350"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="342"/> <source>Links</source> <translation>Ссылки</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="357"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="349"/> <source>This shows an example of the selected colours.</source> <translation>Пример выбранных цветов.</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="153"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="151"/> <source>Exclude Files:</source> <translation>Не включать файлы:</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="160"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="158"/> <source>Enter filename patterns of files to be excluded separated by a comma</source> <translation>Задайте маски файлов для исключения, разделённые запятой</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="192"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="190"/> <source>Press to delete the selected directory from the list</source> <translation>Удалить выбранный каталог из списка</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="371"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="363"/> <source>QtHelp</source> <translation>Qt Помощь</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="377"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="369"/> <source>Generate QtHelp Files</source> <translation>Генерировать файлы Qt Помощи</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="420"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="409"/> <source>Namespace:</source> <translation>Пространство имен:</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="427"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="416"/> <source>Enter the namespace</source> <translation>Введите пространство имен</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="434"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="423"/> <source>Virtual Folder:</source> <translation>Виртуальная папка:</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="441"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="430"/> <source>Enter the name of the virtual folder (must not contain '/')</source> <translation>Введите имя виртуальной папки (не должна содержать '/')</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="448"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="437"/> <source>Filter Name:</source> <translation>Название фильтра:</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="455"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="444"/> <source>Enter the name of the custom filter</source> <translation>Введите название персонального фильтра</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="462"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="451"/> <source>Filter Attributes:</source> <translation>Атрибуты фильтра: </translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="469"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="458"/> <source>Enter the filter attributes separated by ':'</source> <translation>Введите атрибуты фильтра через ':'</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="476"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="465"/> <source>Title:</source> <translation>Заголовок:</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="483"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="472"/> <source>Enter a short title for the top entry</source> <translation>Введите краткий заголовок для точки входа</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="504"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="513"/> <source>Select output directory for QtHelp files</source> <translation>Введите имя каталога назначения для файлов Qt Помощи</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="490"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="479"/> <source>Select to generate the QtHelp collection files</source> <translation>Генерировать файлы коллекций Qt Помощи</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="493"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.ui" line="482"/> <source>Generate QtHelp collection files</source> <translation>Генерировать файлы коллекций Qt Помощи</translation> </message> <message> - <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="47"/> + <location filename="../Plugins/DocumentationPlugins/Ericdoc/EricdocConfigDialog.py" line="53"/> <source><?xml version="1.0" encoding="utf-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN""http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title></title></head><body style="background-color:{BodyBgColor};color:{BodyColor}"><h1 style="background-color:{Level1HeaderBgColor};color:{Level1HeaderColor}">Level 1 Header</h1><h3 style="background-color:{Level2HeaderBgColor};color:{Level2HeaderColor}">Level 2 Header</h3><h2 style="background-color:{CFBgColor};color:{CFColor}">Class and Function Header</h2>Standard body text with <a style="color:{LinkColor}">some links</a> embedded.</body></html></source> <translation></translation> </message> @@ -14650,17 +14765,17 @@ <translation>Добавить</translation> </message> <message> - <location filename="../Helpviewer/Feeds/FeedsDialog.py" line="91"/> + <location filename="../Helpviewer/Feeds/FeedsDialog.py" line="94"/> <source>Add RSS Feed</source> <translation>Добавить канал RSS</translation> </message> <message> - <location filename="../Helpviewer/Feeds/FeedsDialog.py" line="86"/> + <location filename="../Helpviewer/Feeds/FeedsDialog.py" line="89"/> <source>The feed was added successfully.</source> <translation>Уаналы успешно добавлены.</translation> </message> <message> - <location filename="../Helpviewer/Feeds/FeedsDialog.py" line="91"/> + <location filename="../Helpviewer/Feeds/FeedsDialog.py" line="94"/> <source>The feed was already added before.</source> <translation>Каналы уже добавлены.</translation> </message> @@ -14776,7 +14891,7 @@ <translation type="obsolete">Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/fetch.py" line="58"/> <source>Fetching from a remote Mercurial repository</source> <translation>Получение изменений из удалённого репозитория</translation> </message> @@ -14799,12 +14914,12 @@ <translation><b>Получить изменения</b><p>Затянуть изменения из удаленного в локальный репозиторий. Если изменения затянуты с новой головной ветки, эта глова автоматически объединяется, и результат фиксируется. В противном случае рабочий каталог обновляется содержащимися новыми изменениями</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="91"/> <source>Fetch</source> <translation>Запрос</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/FetchExtension/ProjectHelper.py" line="91"/> <source>The project should be reread. Do this now?</source> <translation>Необходимо перезагрузить проект. Сделать это?</translation> </message> @@ -15223,7 +15338,7 @@ <context> <name>FindFileDialog</name> <message> - <location filename="../UI/FindFileDialog.py" line="538"/> + <location filename="../UI/FindFileDialog.py" line="547"/> <source>Select directory</source> <translation>Выберите каталог</translation> </message> @@ -15310,7 +15425,7 @@ <message> <location filename="../UI/FindFileDialog.ui" line="297"/> <source>...</source> - <translation>...</translation> + <translation type="obsolete">...</translation> </message> <message> <location filename="../UI/FindFileDialog.ui" line="96"/> @@ -15348,22 +15463,22 @@ <translation>Найти &текст:</translation> </message> <message> - <location filename="../UI/FindFileDialog.ui" line="338"/> + <location filename="../UI/FindFileDialog.ui" line="335"/> <source>Shows the progress of the search action</source> <translation>Прогресс поиска</translation> </message> <message> - <location filename="../UI/FindFileDialog.ui" line="375"/> + <location filename="../UI/FindFileDialog.ui" line="372"/> <source>Text</source> <translation>Текст</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="67"/> + <location filename="../UI/FindFileDialog.py" line="70"/> <source>Find</source> <translation>Найти</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="62"/> + <location filename="../UI/FindFileDialog.py" line="65"/> <source>Stop</source> <translation>Стоп</translation> </message> @@ -15403,42 +15518,42 @@ <translation>Введите текст замещения или регулярное выражение</translation> </message> <message> - <location filename="../UI/FindFileDialog.ui" line="370"/> + <location filename="../UI/FindFileDialog.ui" line="367"/> <source>File/Line</source> <translation>Файл/Строка</translation> </message> <message> + <location filename="../UI/FindFileDialog.ui" line="380"/> + <source>Press to apply the selected replacements</source> + <translation>Применить подсвеченные замещения</translation> + </message> + <message> <location filename="../UI/FindFileDialog.ui" line="383"/> - <source>Press to apply the selected replacements</source> - <translation>Применить подсвеченные замещения</translation> - </message> - <message> - <location filename="../UI/FindFileDialog.ui" line="386"/> <source>Replace</source> <translation>Заменить</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="649"/> + <location filename="../UI/FindFileDialog.py" line="658"/> <source>Replace in Files</source> <translation>Заменить в файлах</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="608"/> + <location filename="../UI/FindFileDialog.py" line="617"/> <source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Не могу прочитать файл <b>{0}</b>. Пропускаю.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="649"/> + <location filename="../UI/FindFileDialog.py" line="658"/> <source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source> <translation><p>Не могу сохранить файл <b>{0}</b>. Пропускаю.</p><p>Причина: {1}</p></translation> </message> <message> + <location filename="../UI/FindFileDialog.ui" line="305"/> + <source>Search in open files only </source> + <translation>Искать только в открытых файлах</translation> + </message> + <message> <location filename="../UI/FindFileDialog.ui" line="308"/> - <source>Search in open files only </source> - <translation>Искать только в открытых файлах</translation> - </message> - <message> - <location filename="../UI/FindFileDialog.ui" line="311"/> <source>&Open files only</source> <translation>Только в &открытых файлах</translation> </message> @@ -15453,145 +15568,169 @@ <translation>Приблизительно</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="676"/> + <location filename="../UI/FindFileDialog.py" line="685"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="677"/> + <location filename="../UI/FindFileDialog.py" line="686"/> <source>Copy Path to Clipboard</source> <translation>Сопировать путь в буфер обмена</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="371"/> + <location filename="../UI/FindFileDialog.py" line="370"/> <source>Invalid search expression</source> <translation>Неверное выражение для поиска</translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="371"/> + <location filename="../UI/FindFileDialog.py" line="370"/> <source><p>The search expression is not valid.</p><p>Error: {0}</p></source> <translation><p>Неверное выражение для поиска.</p><p>Ошибка: {0}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.py" line="623"/> + <location filename="../UI/FindFileDialog.py" line="632"/> <source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source> <translation><p>Хэш для файла <b>{0}</b> изменился. Пропускаем.</p><p>Хэш 1:{1}</p><p>Хэш 2: {2}</p></translation> </message> <message> - <location filename="../UI/FindFileDialog.ui" line="347"/> + <location filename="../UI/FindFileDialog.ui" line="344"/> <source>%v/%m Files</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../UI/FindFileDialog.py" line="491"/> + <source>{0} / {1}</source> + <comment>occurrences / files</comment> + <translation type="unfinished"></translation> + </message> + <message numerus="yes"> + <location filename="../UI/FindFileDialog.py" line="492"/> + <source>%n occurrence(s)</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../UI/FindFileDialog.py" line="492"/> + <source>%n file(s)</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> </context> <context> <name>FindFileNameDialog</name> <message> - <location filename="../UI/FindFileNameDialog.ui" line="13"/> + <location filename="../UI/FindFileNameDialog.ui" line="14"/> <source>Find File</source> <translation>Найти файл</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.ui" line="19"/> + <location filename="../UI/FindFileNameDialog.ui" line="20"/> <source>Enter filename (? matches any single character, * matches everything)</source> <translation>Задайте имя файла (? означает произвольный символ, * - любое количество произвольных символов)</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.ui" line="34"/> + <location filename="../UI/FindFileNameDialog.ui" line="35"/> <source>Enter file name to search for </source> <translation>Задайте имя файла для поиска</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.ui" line="41"/> + <location filename="../UI/FindFileNameDialog.ui" line="42"/> <source>.</source> <translation>.</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.ui" line="54"/> + <location filename="../UI/FindFileNameDialog.ui" line="55"/> <source>Enter file extension to search for</source> <translation>Задайте расширение файла для поиска</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.ui" line="68"/> + <location filename="../UI/FindFileNameDialog.ui" line="69"/> <source>Enabled to include the entered directory into the search</source> <translation>Разрешено вулючать введённый каталог в поиск</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.ui" line="71"/> + <location filename="../UI/FindFileNameDialog.ui" line="72"/> <source>Search Path:</source> <translation>Путь поиска:</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.ui" line="78"/> + <location filename="../UI/FindFileNameDialog.ui" line="79"/> <source>Enter the directory, the file should be searched in</source> <translation>Задайте каталог, в котором будет проводиться поиск</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.ui" line="85"/> + <location filename="../UI/FindFileNameDialog.ui" line="86"/> <source>Press to select the directory, the file should be searched in</source> <translation>Нажимте для выбора каталога, в котором будет искаться файл</translation> </message> <message> <location filename="../UI/FindFileNameDialog.ui" line="88"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../UI/FindFileNameDialog.ui" line="99"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../UI/FindFileNameDialog.ui" line="97"/> <source>Select to search in the project path</source> <translation>Искать в путях проекта</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.ui" line="102"/> + <location filename="../UI/FindFileNameDialog.ui" line="100"/> <source>Search in &project</source> <translation>Искать в &проекте</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.ui" line="105"/> + <location filename="../UI/FindFileNameDialog.ui" line="103"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.ui" line="112"/> + <location filename="../UI/FindFileNameDialog.ui" line="110"/> <source>Select to search in sys.path</source> <translation>Искать в sys.path</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.ui" line="115"/> + <location filename="../UI/FindFileNameDialog.ui" line="113"/> <source>Search in &sys.path</source> <translation>Искать в &sys.path</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.ui" line="118"/> + <location filename="../UI/FindFileNameDialog.ui" line="116"/> <source>Alt+S</source> <translation>Alt+S</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.ui" line="134"/> + <location filename="../UI/FindFileNameDialog.ui" line="132"/> <source>Filename</source> <translation>Имя файла</translation> </message> <message> - <location filename="../UI/FindFileNameDialog.ui" line="139"/> + <location filename="../UI/FindFileNameDialog.ui" line="137"/> <source>Path</source> <translation>Путь</translation> </message> <message> + <location filename="../UI/FindFileNameDialog.py" line="61"/> + <source>Opens the selected file</source> + <translation>Открыть выбранный файл</translation> + </message> + <message> + <location filename="../UI/FindFileNameDialog.py" line="59"/> + <source>Press to stop the search</source> + <translation>Нажмите, чтобы остановить поиск</translation> + </message> + <message> + <location filename="../UI/FindFileNameDialog.py" line="203"/> + <source>Select search directory</source> + <translation>Выберите каталог для поиска</translation> + </message> + <message> <location filename="../UI/FindFileNameDialog.py" line="57"/> - <source>Opens the selected file</source> - <translation>Открыть выбранный файл</translation> - </message> - <message> - <location filename="../UI/FindFileNameDialog.py" line="55"/> - <source>Press to stop the search</source> - <translation>Нажмите, чтобы остановить поиск</translation> - </message> - <message> - <location filename="../UI/FindFileNameDialog.py" line="199"/> - <source>Select search directory</source> - <translation>Выберите каталог для поиска</translation> - </message> - <message> - <location filename="../UI/FindFileNameDialog.py" line="53"/> <source>Stop</source> <translation>Стоп</translation> </message> @@ -15857,12 +15996,12 @@ <context> <name>Gpg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py" line="87"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py" line="86"/> <source>Verify Signatures</source> <translation>Проверить подписи</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py" line="135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py" line="133"/> <source>Sign Revision</source> <translation>Подписать ревизию</translation> </message> @@ -16200,10 +16339,10 @@ <message> <location filename="../Preferences/ConfigurationPages/HelpAppearancePage.ui" line="185"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/HelpAppearancePage.py" line="132"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/HelpAppearancePage.py" line="135"/> <source>Select Style Sheet</source> <translation>Выберите стиль CSS</translation> </message> @@ -16228,22 +16367,22 @@ <translation type="obsolete"><font color="#FF0000"><b>Примечание:</b> Эти изменения вступят в силу при следующем запуске приложения.</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpAppearancePage.ui" line="195"/> + <location filename="../Preferences/ConfigurationPages/HelpAppearancePage.ui" line="192"/> <source>Tabs</source> <translation>Закладки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpAppearancePage.ui" line="201"/> + <location filename="../Preferences/ConfigurationPages/HelpAppearancePage.ui" line="198"/> <source>Show only one close button instead of one for each tab</source> <translation>Показывать только одну общую закрывающую кнопку</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpAppearancePage.ui" line="211"/> - <source>Warn, if multiple tabs are about to be closed</source> - <translation>Предупреждать, если несколько вкладок будут закрыты</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/HelpAppearancePage.ui" line="208"/> + <source>Warn, if multiple tabs are about to be closed</source> + <translation>Предупреждать, если несколько вкладок будут закрыты</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/HelpAppearancePage.ui" line="205"/> <source>Select to issue a warning, if multiple tabs are about to be closed</source> <translation>Выдавать предупреждение, о закрытии нескольких вкладок</translation> </message> @@ -16742,45 +16881,45 @@ <message> <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="262"/> <source>...</source> - <translation>...</translation> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="103"/> + <source>Qt4 Documentation</source> + <translation>Документация Qt4</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="126"/> + <source>Press to select the Qt4 documentation directory via a dialog</source> + <translation>Выбрать каталог документации Qt4 с помощью диалога</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="109"/> - <source>Qt4 Documentation</source> - <translation>Документация Qt4</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="115"/> - <source>Press to select the Qt4 documentation directory via a dialog</source> - <translation>Выбрать каталог документации Qt4 с помощью диалога</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="125"/> <source>Enter the Qt4 documentation directory</source> <translation>Задайте каталог документации Qt4</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="132"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="116"/> <source><b>Note</b>: Leave empty to use the QT4DOCDIR environment variable, if set.</source> <translation><b>Примечание</b>: Оставьте поле пустым, чтобы использовать переменную окружения QT4DOCDIR.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="181"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="169"/> <source>PyQt4 Documentation</source> <translation>Документация PyQt4</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="187"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="192"/> <source>Press to select the PyQt4 documentation directory via a dialog</source> <translation>Выберите путь к каталогу документации PyQt4 с помощью диалога</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="197"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="175"/> <source>Enter the PyQt4 documentation directory</source> <translation>Задайте каталог документации PyQt4</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="204"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="182"/> <source><b>Note</b>: Leave empty to use the PYQT4DOCDIR environment variable, if set.</source> <translation><b>Примечание</b>: Оставьте поле пустым, чтобы использовать переменную окружения PYQT4DOCDIR.</translation> </message> @@ -16790,47 +16929,47 @@ <translation><b>Настроить справку</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="253"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="235"/> <source>PySide Documentation</source> <translation>Документация PySide</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="259"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="258"/> <source>Press to select the PySide documentation directory via a dialog</source> <translation>Выберите путь к каталогу документации PySide с помощью диалога</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="269"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="241"/> <source>Enter the PySide documentation directory</source> <translation>Задайте каталог документации PySide</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="276"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="248"/> <source><b>Note</b>: Leave empty to use the PYSIDEDOCDIR environment variable, if set.</source> <translation><b>Примечание</b>: Оставьте поле пустым, чтобы использовать переменную окружения PYSIDEDOCDIR.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="189"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="199"/> <source>HTML Files (*.html *.htm);;All Files (*)</source> <translation>Файлы разметки HTML (*.html *.htm);;Все файлы(*)</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="133"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="143"/> <source>Select Qt4 documentation entry</source> <translation>Выберите каталог документации Qt4</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="161"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="171"/> <source>Select PyQt4 documentation entry</source> <translation>Выберите каталог документации PyQt4</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="189"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="199"/> <source>Select PySide documentation entry</source> <translation>Задайте каталог документации PySide</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="116"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="126"/> <source>HTML Files (*.html *.htm);;Compressed Help Files (*.chm);;All Files (*)</source> <translation>HTML файлы (*.html *.htm);;Компрессированные файлы помощи (*.chm);;Все файлы (*)</translation> </message> @@ -16840,97 +16979,97 @@ <translation>Документация Pyton 2</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="43"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="60"/> <source>Press to select the Python 2 documentation directory via a dialog</source> <translation>Задайте каталог документации Pyton 2</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="53"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="43"/> <source>Enter the Python 2 documentation directory</source> <translation>Задайте каталог документации Pyton2</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="60"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="50"/> <source><b>Note</b>: Leave empty to use the PYTHON2DOCDIR environment variable, if set.</source> <translation><b>Примечание</b>: Оставьте поле пустым, чтобы использовать переменную окружения PYTHON2DOCDIR.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="73"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="70"/> <source>Python 3 Documentation</source> <translation>Документация Pyton 3</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="79"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="93"/> <source>Press to select the Python 3 documentation directory via a dialog</source> <translation>Задайте каталог документации Pyton 3</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="89"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="76"/> <source>Enter the Python 3 documentation directory</source> <translation>Задайте каталог документации Pyton 3</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="96"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="83"/> <source><b>Note</b>: Leave empty to use the PYTHON3DOCDIR environment variable, if set.</source> <translation><b>Примечание</b>: Оставьте поле пустым, чтобы использовать переменную окружения PYTHON3DOCDIR.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="99"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="109"/> <source>Select Python 2 documentation entry</source> <translation>Выберите тему в документации по Python 2</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="116"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="126"/> <source>Select Python 3 documentation entry</source> <translation>Выберите тему в документации по Python 3</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="145"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="136"/> <source>Qt5 Documentation</source> <translation>Документация Qt5</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="151"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="159"/> <source>Press to select the Qt5 documentation directory via a dialog</source> <translation>Выбрать каталог документации Qt5 с помощью диалога</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="161"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="142"/> <source>Enter the Qt5 documentation directory</source> <translation>Задайте каталог документации Qt5</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="168"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="149"/> <source><b>Note</b>: Leave empty to use the QT5DOCDIR environment variable, if set.</source> <translation><b>Примечание</b>: Оставьте поле пустым, чтобы использовать переменную окружения QT4DOCDIR.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="147"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="157"/> <source>Select Qt5 documentation entry</source> <translation>Выберите каталог документации Qt5</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="217"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="202"/> <source>PyQt5 Documentation</source> <translation type="unfinished">Документация PyQt4 {5 ?}</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="223"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="225"/> <source>Press to select the PyQt5 documentation directory via a dialog</source> <translation type="unfinished">Выберите путь к каталогу документации PyQt4 с помощью диалога {5 ?}</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="208"/> <source>Enter the PyQt5 documentation directory</source> <translation type="unfinished">Задайте каталог документации PyQt4 {5 ?}</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="240"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.ui" line="215"/> <source><b>Note</b>: Leave empty to use the PYQT5DOCDIR environment variable, if set.</source> <translation type="unfinished"><b>Примечание</b>: Оставьте поле пустым, чтобы использовать переменную окружения PYQT4DOCDIR. {5D?}</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="175"/> + <location filename="../Preferences/ConfigurationPages/HelpDocumentationPage.py" line="185"/> <source>Select PyQt5 documentation entry</source> <translation type="unfinished">Выберите каталог документации PyQt4 {5 ?}</translation> </message> @@ -16988,20 +17127,20 @@ <message> <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.ui" line="70"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="57"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="60"/> <source>System</source> <translation>Система</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="70"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="73"/> <source>Select style sheet file</source> <translation>Выберите файл стиля</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="70"/> + <location filename="../Preferences/ConfigurationPages/HelpInterfacePage.py" line="73"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation>Стили Qt (*.qss);;Каскадные стили (*.css);;Все файлы (*)</translation> </message> @@ -17135,32 +17274,32 @@ <translation type="obsolete">Встроенный просмотрщик Web</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="639"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="642"/> <source><p>Printing is not available due to a bug in PyQt4.Please upgrade.</p></source> <translation><p>Печать невозможна из-за ошибки в PyQt4. Пожалуйста установите обновление.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="740"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="743"/> <source>Loading...</source> <translation>Загружаю...</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="761"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="764"/> <source>Finished loading</source> <translation>Загрузка завершена</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="763"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="766"/> <source>Failed to load</source> <translation>Загрука не удалась</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="803"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="806"/> <source>Are you sure you want to close the window?</source> <translation>Вы действительно хотите закрыть это окно?</translation> </message> <message numerus="yes"> - <location filename="../Helpviewer/HelpTabWidget.py" line="803"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="806"/> <source>Are you sure you want to close the window? You have %n tab(s) open.</source> <translation> @@ -17173,22 +17312,22 @@ </translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="811"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="814"/> <source>&Close</source> <translation>&Закрыть</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="815"/> - <source>&Quit</source> - <translation>&Выход</translation> - </message> - <message> <location filename="../Helpviewer/HelpTabWidget.py" line="818"/> + <source>&Quit</source> + <translation>&Выход</translation> + </message> + <message> + <location filename="../Helpviewer/HelpTabWidget.py" line="821"/> <source>C&lose Current Tab</source> <translation>&Закрыть текущую закладку</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="639"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="642"/> <source>eric5 Web Browser</source> <translation>WEB просмотрщик встроенный в Eric5</translation> </message> @@ -17208,17 +17347,17 @@ <translation>Восстановить закрытые вкладки</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="975"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="978"/> <source>Restore All Closed Tabs</source> <translation>Восстановить все закрытые вкладки</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="977"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="980"/> <source>Clear List</source> <translation>Очистить список</translation> </message> <message> - <location filename="../Helpviewer/HelpTabWidget.py" line="586"/> + <location filename="../Helpviewer/HelpTabWidget.py" line="588"/> <source><p>Printing is not available due to a bug in PyQt4. Please upgrade.</p></source> <translation type="unfinished"></translation> </message> @@ -17274,25 +17413,25 @@ <message> <location filename="../Preferences/ConfigurationPages/HelpViewersPage.ui" line="61"/> <source>...</source> - <translation>...</translation> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.ui" line="67"/> + <source>Select to use a custom viewer</source> + <translation>Использовать специальный просмотрщик</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/HelpViewersPage.ui" line="70"/> - <source>Select to use a custom viewer</source> - <translation>Использовать специальный просмотрщик</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.ui" line="73"/> <source>Custom</source> <translation>Свой</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.ui" line="77"/> + <source>Select to use Qt Assistant</source> + <translation>Использовать Qt Assistant</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/HelpViewersPage.ui" line="80"/> - <source>Select to use Qt Assistant</source> - <translation>Использовать Qt Assistant</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.ui" line="83"/> <source>Qt Assistant</source> <translation>Qt Assistant</translation> </message> @@ -17307,22 +17446,22 @@ <translation type="obsolete">Просмотрщик Web</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="78"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="82"/> <source>Select Custom Viewer</source> <translation>Выбрать специальный просмотрщик</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="92"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="96"/> <source>Select Web-Browser</source> <translation>Выбрать обозреватель Web</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="106"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="110"/> <source>Select PDF-Viewer</source> <translation>Выберите просмотрщик PDF</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="120"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.py" line="124"/> <source>Select CHM-Viewer</source> <translation>Выберите просмотрщик CHM</translation> </message> @@ -17332,22 +17471,22 @@ <translation><b>Настроить просмотрщики справки</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.ui" line="90"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.ui" line="87"/> <source>Select to use the Eric Web Browser</source> <translation>Использовать WEB просмотрщик встроенный в Eric</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.ui" line="93"/> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.ui" line="90"/> <source>Eric Web Browser</source> <translation>WEB просмотрщик встроенный в Eric</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/HelpViewersPage.ui" line="100"/> + <source>Select to use the configured web browser of the system</source> + <translation>Использовать выбранный системный просмотрщик Web</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/HelpViewersPage.ui" line="103"/> - <source>Select to use the configured web browser of the system</source> - <translation>Использовать выбранный системный просмотрщик Web</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/HelpViewersPage.ui" line="106"/> <source>System Web Browser</source> <translation>системный WEB просмотрщик</translation> </message> @@ -18013,683 +18152,683 @@ <context> <name>HelpWindow</name> <message> - <location filename="../Helpviewer/HelpWindow.py" line="439"/> + <location filename="../Helpviewer/HelpWindow.py" line="449"/> <source>New Window</source> <translation>Новое окно</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="2007"/> + <location filename="../Helpviewer/HelpWindow.py" line="2019"/> <source>Open File</source> <translation>Открыть файл</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="454"/> + <location filename="../Helpviewer/HelpWindow.py" line="464"/> <source>&Open File</source> <translation>&Открыть файл</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="460"/> + <location filename="../Helpviewer/HelpWindow.py" line="470"/> <source>Open a help file for display</source> <translation>Открыть файл помощи для дисплея</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="461"/> + <location filename="../Helpviewer/HelpWindow.py" line="471"/> <source><b>Open File</b><p>This opens a new help file for display. It pops up a file selection dialog.</p></source> <translation><b>Открыть файл</b><p>Открыть новый файл помощи. Вызывает файловый диалог</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="567"/> + <location filename="../Helpviewer/HelpWindow.py" line="577"/> <source>Print</source> <translation>Печать</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="567"/> + <location filename="../Helpviewer/HelpWindow.py" line="577"/> <source>&Print</source> <translation>&Печать</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="573"/> + <location filename="../Helpviewer/HelpWindow.py" line="583"/> <source>Print the displayed help</source> <translation>Печатать текущий раздел помощи</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="574"/> + <location filename="../Helpviewer/HelpWindow.py" line="584"/> <source><b>Print</b><p>Print the displayed help text.</p></source> <translation><b>Печать</b><p>Печатать текущий раздел помощи</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="614"/> + <location filename="../Helpviewer/HelpWindow.py" line="624"/> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="614"/> + <location filename="../Helpviewer/HelpWindow.py" line="624"/> <source>&Close</source> <translation>&Закрыть</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="620"/> + <location filename="../Helpviewer/HelpWindow.py" line="630"/> <source>Close the current help window</source> <translation>Закрыть это окно помощи</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="661"/> + <location filename="../Helpviewer/HelpWindow.py" line="671"/> <source>Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="661"/> + <location filename="../Helpviewer/HelpWindow.py" line="671"/> <source>&Quit</source> <translation>&Выход</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="679"/> + <location filename="../Helpviewer/HelpWindow.py" line="689"/> <source>Backward</source> <translation>Назад</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="679"/> + <location filename="../Helpviewer/HelpWindow.py" line="689"/> <source>&Backward</source> <translation>&Назад</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="686"/> - <source>Move one help screen backward</source> - <translation>Назад на один экран</translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="687"/> - <source><b>Backward</b><p>Moves one help screen backward. If none is available, this action is disabled.</p></source> - <translation><b>Назад</b><p>Сместиться на один экран назад. Если это возможно.</p></translation> - </message> - <message> <location filename="../Helpviewer/HelpWindow.py" line="696"/> + <source>Move one help screen backward</source> + <translation>Назад на один экран</translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="697"/> + <source><b>Backward</b><p>Moves one help screen backward. If none is available, this action is disabled.</p></source> + <translation><b>Назад</b><p>Сместиться на один экран назад. Если это возможно.</p></translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="706"/> <source>Forward</source> <translation>Вперёд</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="696"/> + <location filename="../Helpviewer/HelpWindow.py" line="706"/> <source>&Forward</source> <translation>&Вперёд</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="703"/> + <location filename="../Helpviewer/HelpWindow.py" line="713"/> <source>Move one help screen forward</source> <translation>Вперёд на один экран</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="705"/> + <location filename="../Helpviewer/HelpWindow.py" line="715"/> <source><b>Forward</b><p>Moves one help screen forward. If none is available, this action is disabled.</p></source> <translation><b>Вперёд</b><p>Сместиться на один экран вперёд, если это возможно.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="714"/> + <location filename="../Helpviewer/HelpWindow.py" line="724"/> <source>Home</source> <translation>Домой</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="714"/> + <location filename="../Helpviewer/HelpWindow.py" line="724"/> <source>&Home</source> <translation>&Домой</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="720"/> + <location filename="../Helpviewer/HelpWindow.py" line="730"/> <source>Move to the initial help screen</source> <translation>Вернуться на первоначальную страницу</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="722"/> + <location filename="../Helpviewer/HelpWindow.py" line="732"/> <source><b>Home</b><p>Moves to the initial help screen.</p></source> <translation><b>Домой</b><p>Вернуться на первоначальную страницу.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="842"/> + <location filename="../Helpviewer/HelpWindow.py" line="852"/> <source>Add Bookmark</source> <translation>Добавить закладку</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="889"/> + <location filename="../Helpviewer/HelpWindow.py" line="899"/> <source>What's This?</source> <translation>Что это?</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="889"/> + <location filename="../Helpviewer/HelpWindow.py" line="899"/> <source>&What's This?</source> <translation>&Что это?</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="895"/> + <location filename="../Helpviewer/HelpWindow.py" line="905"/> <source>Context sensitive help</source> <translation>Контекстная помощь</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="896"/> + <location filename="../Helpviewer/HelpWindow.py" line="906"/> <source><b>Display context sensitive help</b><p>In What's This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.</p></source> <translation><b>Показать контекстную помощь</b> <p>В режиме контекстной помощи курсор мыши выглядит как стрелка со знаком вопроса, и, щёлкнув по элементу интерфейса, Вы можете просмотреть краткую помощь о его роли и его использовании. В диалогах можно воспользоваться кнопкой контекстной помощи в заголовке окна.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="908"/> + <location filename="../Helpviewer/HelpWindow.py" line="918"/> <source>About</source> <translation>О</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="908"/> + <location filename="../Helpviewer/HelpWindow.py" line="918"/> <source>&About</source> <translation>&О</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="912"/> - <source>Display information about this software</source> - <translation>Информация о ПО</translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="914"/> - <source><b>About</b><p>Display some information about this software.</p></source> - <translation><b>О...</b><p>Информация об этом программном продукте.</p></translation> - </message> - <message> <location filename="../Helpviewer/HelpWindow.py" line="922"/> + <source>Display information about this software</source> + <translation>Информация о ПО</translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="924"/> + <source><b>About</b><p>Display some information about this software.</p></source> + <translation><b>О...</b><p>Информация об этом программном продукте.</p></translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="932"/> <source>About Qt</source> <translation>О Qt</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="922"/> + <location filename="../Helpviewer/HelpWindow.py" line="932"/> <source>About &Qt</source> <translation>О &Qt</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="926"/> - <source>Display information about the Qt toolkit</source> - <translation>Информация о библиотеке Qt</translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="928"/> - <source><b>About Qt</b><p>Display some information about the Qt toolkit.</p></source> - <translation><b>О Qt</b><p>Информация о библиотеке Qt.</p></translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="936"/> - <source>Zoom in</source> - <translation>Увеличить масштаб</translation> - </message> - <message> <location filename="../Helpviewer/HelpWindow.py" line="936"/> + <source>Display information about the Qt toolkit</source> + <translation>Информация о библиотеке Qt</translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="938"/> + <source><b>About Qt</b><p>Display some information about the Qt toolkit.</p></source> + <translation><b>О Qt</b><p>Информация о библиотеке Qt.</p></translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="946"/> + <source>Zoom in</source> + <translation>Увеличить масштаб</translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="946"/> <source>Zoom &in</source> <translation>У&величить масштаб</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="943"/> + <location filename="../Helpviewer/HelpWindow.py" line="953"/> <source>Zoom in on the text</source> <translation>Увеличить масштаб текста</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="944"/> + <location filename="../Helpviewer/HelpWindow.py" line="954"/> <source><b>Zoom in</b><p>Zoom in on the text. This makes the text bigger.</p></source> <translation><b>Увеличить масштаб</b><p>Увеличить масштаб. Размер букв увеличится.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="952"/> + <location filename="../Helpviewer/HelpWindow.py" line="962"/> <source>Zoom out</source> <translation>Уменьшить масштаб</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="952"/> + <location filename="../Helpviewer/HelpWindow.py" line="962"/> <source>Zoom &out</source> <translation>У&меньшить масштаб</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="959"/> + <location filename="../Helpviewer/HelpWindow.py" line="969"/> <source>Zoom out on the text</source> <translation>Уменьшить масштаб текста</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="960"/> + <location filename="../Helpviewer/HelpWindow.py" line="970"/> <source><b>Zoom out</b><p>Zoom out on the text. This makes the text smaller.</p></source> <translation><b>Уменьшить масштаб</b><p>Уменьшить масштаб. Размер букв уменьшится.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="763"/> + <location filename="../Helpviewer/HelpWindow.py" line="773"/> <source>Copy</source> <translation>Копировать</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="763"/> + <location filename="../Helpviewer/HelpWindow.py" line="773"/> <source>&Copy</source> <translation>&Копировать</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="769"/> + <location filename="../Helpviewer/HelpWindow.py" line="779"/> <source>Copy the selected text</source> <translation>Копировать выбранный текст</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="770"/> + <location filename="../Helpviewer/HelpWindow.py" line="780"/> <source><b>Copy</b><p>Copy the selected text to the clipboard.</p></source> <translation><b>Копировать</b><p>Копировать выбранный текст в буфер обмена.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1521"/> + <location filename="../Helpviewer/HelpWindow.py" line="1531"/> <source>&File</source> <translation>&Файл</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1543"/> + <location filename="../Helpviewer/HelpWindow.py" line="1553"/> <source>&Edit</source> <translation>&Правка</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1551"/> + <location filename="../Helpviewer/HelpWindow.py" line="1561"/> <source>&View</source> <translation>&Вид</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1568"/> + <location filename="../Helpviewer/HelpWindow.py" line="1578"/> <source>&Go</source> <translation>&Перейти</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1583"/> + <location filename="../Helpviewer/HelpWindow.py" line="1593"/> <source>H&istory</source> <translation>И&стория</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1591"/> + <location filename="../Helpviewer/HelpWindow.py" line="1601"/> <source>&Bookmarks</source> <translation>&Закладки</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1664"/> + <location filename="../Helpviewer/HelpWindow.py" line="1674"/> <source>&Help</source> <translation>&Помощь</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="730"/> + <location filename="../Helpviewer/HelpWindow.py" line="740"/> <source>Reload</source> <translation>Переоткрыть</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="730"/> + <location filename="../Helpviewer/HelpWindow.py" line="740"/> <source>&Reload</source> <translation>П&ереоткрыть</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="737"/> + <location filename="../Helpviewer/HelpWindow.py" line="747"/> <source>Reload the current help screen</source> <translation>Переоткрыть это окно помощи</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="739"/> + <location filename="../Helpviewer/HelpWindow.py" line="749"/> <source><b>Reload</b><p>Reloads the current help screen.</p></source> <translation><b>Переоткрыть</b><p>Переоткрыть это окно помощи.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="439"/> + <location filename="../Helpviewer/HelpWindow.py" line="449"/> <source>Ctrl+N</source> <comment>File|New Window</comment> <translation>Ctrl+N</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="454"/> + <location filename="../Helpviewer/HelpWindow.py" line="464"/> <source>Ctrl+O</source> <comment>File|Open</comment> <translation>Ctrl+O</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="567"/> + <location filename="../Helpviewer/HelpWindow.py" line="577"/> <source>Ctrl+P</source> <comment>File|Print</comment> <translation>Ctrl+P</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="614"/> + <location filename="../Helpviewer/HelpWindow.py" line="624"/> <source>Ctrl+W</source> <comment>File|Close</comment> <translation>Ctrl+W</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="661"/> + <location filename="../Helpviewer/HelpWindow.py" line="671"/> <source>Ctrl+Q</source> <comment>File|Quit</comment> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="778"/> + <location filename="../Helpviewer/HelpWindow.py" line="788"/> <source>&Find...</source> <translation>&Найти...</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="784"/> + <location filename="../Helpviewer/HelpWindow.py" line="794"/> <source>Find text in page</source> <translation>Найти далее</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="785"/> + <location filename="../Helpviewer/HelpWindow.py" line="795"/> <source><b>Find</b><p>Find text in the current page.</p></source> <translation><b>Поиск</b><p>Искать текст на текущей странице.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="793"/> + <location filename="../Helpviewer/HelpWindow.py" line="803"/> <source>Find &next</source> <translation>Найти &далее</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="809"/> + <location filename="../Helpviewer/HelpWindow.py" line="819"/> <source>Find &previous</source> <translation>Найти п&редыдущее</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="763"/> + <location filename="../Helpviewer/HelpWindow.py" line="773"/> <source>Ctrl+C</source> <comment>Edit|Copy</comment> <translation>Ctrl+C</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1675"/> + <location filename="../Helpviewer/HelpWindow.py" line="1685"/> <source>File</source> <translation>Файл</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1700"/> + <location filename="../Helpviewer/HelpWindow.py" line="1710"/> <source>Edit</source> <translation>Редактировать</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1705"/> + <location filename="../Helpviewer/HelpWindow.py" line="1715"/> <source>View</source> <translation>Вид</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1714"/> + <location filename="../Helpviewer/HelpWindow.py" line="1724"/> <source>Find</source> <translation>Найти</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1752"/> + <location filename="../Helpviewer/HelpWindow.py" line="1762"/> <source>Help</source> <translation>Помощь</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1759"/> + <location filename="../Helpviewer/HelpWindow.py" line="1769"/> <source>Go</source> <translation>Перейти</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="2007"/> + <location filename="../Helpviewer/HelpWindow.py" line="2019"/> <source>Help Files (*.html *.htm);;PDF Files (*.pdf);;CHM Files (*.chm);;All Files (*)</source> <translation>Файлы помощи (*.html *.htm);;Файлы PDF (*.pdf);;Файлы CHM (*.chm);;Все файлы (*)</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="424"/> + <location filename="../Helpviewer/HelpWindow.py" line="434"/> <source>&New Tab</source> <translation>&Новая закладка</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="424"/> + <location filename="../Helpviewer/HelpWindow.py" line="434"/> <source>Ctrl+T</source> <comment>File|New Tab</comment> <translation>Ctrl+T</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="431"/> + <location filename="../Helpviewer/HelpWindow.py" line="441"/> <source><b>New Tab</b><p>This opens a new help window tab.</p></source> <translation><b>Новая закладка</b> <p>Открывает новую закладку с помощью.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="446"/> + <location filename="../Helpviewer/HelpWindow.py" line="456"/> <source><b>New Window</b><p>This opens a new help browser window.</p></source> <translation><b>Новое окно</b> <p>Открывает новое окно просмотрщика.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="622"/> + <location filename="../Helpviewer/HelpWindow.py" line="632"/> <source><b>Close</b><p>Closes the current help window.</p></source> <translation><b>Закрыть</b> <p>Закрывает текущее окно просмотрщика помощи.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="630"/> + <location filename="../Helpviewer/HelpWindow.py" line="640"/> <source>Close &All</source> <translation>Закрыть &всё</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="635"/> + <location filename="../Helpviewer/HelpWindow.py" line="645"/> <source><b>Close All</b><p>Closes all help windows except the first one.</p></source> <translation><b>Закрыть все</b> <p>Закрывает все окна просмотрщиков помощи, кроме первого.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="430"/> + <location filename="../Helpviewer/HelpWindow.py" line="440"/> <source>Open a new help window tab</source> <translation>Открыть новую закладку</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="445"/> + <location filename="../Helpviewer/HelpWindow.py" line="455"/> <source>Open a new help browser window</source> <translation>Открыть новое окно</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="470"/> + <location filename="../Helpviewer/HelpWindow.py" line="480"/> <source>Open File in New &Tab</source> <translation>Открыть файл в новой &закладке</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="470"/> + <location filename="../Helpviewer/HelpWindow.py" line="480"/> <source>Shift+Ctrl+O</source> <comment>File|Open in new tab</comment> <translation>Shift+Ctrl+O</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="476"/> + <location filename="../Helpviewer/HelpWindow.py" line="486"/> <source>Open a help file for display in a new tab</source> <translation>Открыть файл для отображения в новой закладке</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="478"/> + <location filename="../Helpviewer/HelpWindow.py" line="488"/> <source><b>Open File in New Tab</b><p>This opens a new help file for display in a new tab. It pops up a file selection dialog.</p></source> <translation><b>Открыть файл в новой закладке</b> <p>Открывает файл в новой закладке. Запускает диалог выбора файла</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="424"/> + <location filename="../Helpviewer/HelpWindow.py" line="434"/> <source>New Tab</source> <translation>Новая закладка</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="470"/> + <location filename="../Helpviewer/HelpWindow.py" line="480"/> <source>Open File in New Tab</source> <translation>Открыть файл в новой закладке</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="630"/> + <location filename="../Helpviewer/HelpWindow.py" line="640"/> <source>Close All</source> <translation>Закрыть всё</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="679"/> + <location filename="../Helpviewer/HelpWindow.py" line="689"/> <source>Alt+Left</source> <comment>Go|Backward</comment> <translation>Alt+Left</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="679"/> + <location filename="../Helpviewer/HelpWindow.py" line="689"/> <source>Backspace</source> <comment>Go|Backward</comment> <translation>Backspace</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="696"/> + <location filename="../Helpviewer/HelpWindow.py" line="706"/> <source>Alt+Right</source> <comment>Go|Forward</comment> <translation>Alt+Right</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="696"/> + <location filename="../Helpviewer/HelpWindow.py" line="706"/> <source>Shift+Backspace</source> <comment>Go|Forward</comment> <translation>Shift+Backspace</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="714"/> + <location filename="../Helpviewer/HelpWindow.py" line="724"/> <source>Ctrl+Home</source> <comment>Go|Home</comment> <translation>Ctrl+Home</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="730"/> + <location filename="../Helpviewer/HelpWindow.py" line="740"/> <source>Ctrl+R</source> <comment>Go|Reload</comment> <translation>Ctrl+R</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="778"/> + <location filename="../Helpviewer/HelpWindow.py" line="788"/> <source>Find...</source> <translation>Найти...</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="778"/> + <location filename="../Helpviewer/HelpWindow.py" line="788"/> <source>Ctrl+F</source> <comment>Edit|Find</comment> <translation>Ctrl+F</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="793"/> + <location filename="../Helpviewer/HelpWindow.py" line="803"/> <source>Find next</source> <translation>Найти далее</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="793"/> + <location filename="../Helpviewer/HelpWindow.py" line="803"/> <source>F3</source> <comment>Edit|Find next</comment> <translation>F3</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="809"/> + <location filename="../Helpviewer/HelpWindow.py" line="819"/> <source>Find previous</source> <translation>Найти предыдущее</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="809"/> + <location filename="../Helpviewer/HelpWindow.py" line="819"/> <source>Shift+F3</source> <comment>Edit|Find previous</comment> <translation>Shift+F3</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="889"/> + <location filename="../Helpviewer/HelpWindow.py" line="899"/> <source>Shift+F1</source> <comment>Help|What's This?'</comment> <translation>Shift+F1</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="936"/> + <location filename="../Helpviewer/HelpWindow.py" line="946"/> <source>Ctrl++</source> <comment>View|Zoom in</comment> <translation>Ctrl++</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="952"/> + <location filename="../Helpviewer/HelpWindow.py" line="962"/> <source>Ctrl+-</source> <comment>View|Zoom out</comment> <translation>Ctrl+-</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="799"/> + <location filename="../Helpviewer/HelpWindow.py" line="809"/> <source>Find next occurrence of text in page</source> <translation>Искать далее на странице</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="801"/> + <location filename="../Helpviewer/HelpWindow.py" line="811"/> <source><b>Find next</b><p>Find the next occurrence of text in the current page.</p></source> <translation><b>Искать далее</b><p>Искать далее на текущей странице.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="815"/> + <location filename="../Helpviewer/HelpWindow.py" line="825"/> <source>Find previous occurrence of text in page</source> <translation>Искать на странице назад</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="817"/> + <location filename="../Helpviewer/HelpWindow.py" line="827"/> <source><b>Find previous</b><p>Find the previous occurrence of text in the current page.</p></source> <translation><b>Искать назад</b><p>Искать назад на текущей странице.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="598"/> + <location filename="../Helpviewer/HelpWindow.py" line="608"/> <source>Print Preview</source> <translation>Предварительный просмотр печати</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="603"/> + <location filename="../Helpviewer/HelpWindow.py" line="613"/> <source>Print preview of the displayed help</source> <translation>Предварительный просмотр печати помощи</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="605"/> + <location filename="../Helpviewer/HelpWindow.py" line="615"/> <source><b>Print Preview</b><p>Print preview of the displayed help text.</p></source> <translation><b>Предварительный просмотр печати</b><p>Предварительный просмотр печати помощи.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1031"/> + <location filename="../Helpviewer/HelpWindow.py" line="1041"/> <source>Show next tab</source> <translation>Показать следующую закладку</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1031"/> - <source>Ctrl+Alt+Tab</source> - <translation>Ctrl+Alt+Tab</translation> - </message> - <message> <location filename="../Helpviewer/HelpWindow.py" line="1041"/> - <source>Show previous tab</source> - <translation>Показать предыдущую закладку</translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="1041"/> - <source>Shift+Ctrl+Alt+Tab</source> - <translation>Shift+Ctrl+Alt+Tab</translation> + <source>Ctrl+Alt+Tab</source> + <translation>Ctrl+Alt+Tab</translation> </message> <message> <location filename="../Helpviewer/HelpWindow.py" line="1051"/> - <source>Switch between tabs</source> - <translation>Переключиться между закладками</translation> + <source>Show previous tab</source> + <translation>Показать предыдущую закладку</translation> </message> <message> <location filename="../Helpviewer/HelpWindow.py" line="1051"/> - <source>Ctrl+1</source> - <translation>Ctrl+1</translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="1300"/> - <source>Clear icons database</source> - <translation>Очистить базу данных иконок</translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="1305"/> - <source>Clear the database of favicons</source> - <translation>Очистить базу данных иконок</translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="1307"/> - <source><b>Clear icons database</b><p>Clears the database of favicons of previously visited URLs.</p></source> - <translation><b>Очистить базу данных иконок</b><p>Очистить базу данных иконок ранее посещённых WEB сайтов.</p></translation> + <source>Shift+Ctrl+Alt+Tab</source> + <translation>Shift+Ctrl+Alt+Tab</translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="1061"/> + <source>Switch between tabs</source> + <translation>Переключиться между закладками</translation> </message> <message> <location filename="../Helpviewer/HelpWindow.py" line="1061"/> + <source>Ctrl+1</source> + <translation>Ctrl+1</translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="1310"/> + <source>Clear icons database</source> + <translation>Очистить базу данных иконок</translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="1315"/> + <source>Clear the database of favicons</source> + <translation>Очистить базу данных иконок</translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="1317"/> + <source><b>Clear icons database</b><p>Clears the database of favicons of previously visited URLs.</p></source> + <translation><b>Очистить базу данных иконок</b><p>Очистить базу данных иконок ранее посещённых WEB сайтов.</p></translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="1071"/> <source>Preferences</source> <translation>Предпочтения</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1061"/> + <location filename="../Helpviewer/HelpWindow.py" line="1071"/> <source>&Preferences...</source> <translation>&Предпочтения...</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1065"/> + <location filename="../Helpviewer/HelpWindow.py" line="1075"/> <source>Set the prefered configuration</source> <translation>Установите предпочтительную конфигурацию</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1067"/> + <location filename="../Helpviewer/HelpWindow.py" line="1077"/> <source><b>Preferences</b><p>Set the configuration items of the application with your prefered values.</p></source> <translation><b>Предпочтения</b> <p>Настройте Eric по своему вкусу.</p></translation> @@ -18700,217 +18839,217 @@ <translation>Содержимое</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="634"/> + <location filename="../Helpviewer/HelpWindow.py" line="644"/> <source>Close all help windows</source> <translation>Закрыть все окна просмотрщиков помощи</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1178"/> + <location filename="../Helpviewer/HelpWindow.py" line="1188"/> <source>Sync with Table of Contents</source> <translation>Синхронизировать с содержанием</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1183"/> + <location filename="../Helpviewer/HelpWindow.py" line="1193"/> <source>Synchronizes the table of contents with current page</source> <translation>Синхронизировать содержание с текущей страницей</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1185"/> + <location filename="../Helpviewer/HelpWindow.py" line="1195"/> <source><b>Sync with Table of Contents</b><p>Synchronizes the table of contents with current page.</p></source> <translation><b>Синхронизировать с содержанием</b><p>Синхронизировать содержание с текущей страницей.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1194"/> + <location filename="../Helpviewer/HelpWindow.py" line="1204"/> <source>Table of Contents</source> <translation>Содержание</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1198"/> + <location filename="../Helpviewer/HelpWindow.py" line="1208"/> <source>Shows the table of contents window</source> <translation>Показывает окно с содержанием</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1200"/> + <location filename="../Helpviewer/HelpWindow.py" line="1210"/> <source><b>Table of Contents</b><p>Shows the table of contents window.</p></source> <translation><b>Содержание</b><p>Показывает окно с содержанием.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1237"/> + <location filename="../Helpviewer/HelpWindow.py" line="1247"/> <source>Manage QtHelp Documents</source> <translation>Управлять документацией Qt4</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1241"/> + <location filename="../Helpviewer/HelpWindow.py" line="1251"/> <source>Shows a dialog to manage the QtHelp documentation set</source> <translation>Показывает диалог управления документацией Qt4</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1243"/> - <source><b>Manage QtHelp Documents</b><p>Shows a dialog to manage the QtHelp documentation set.</p></source> - <translation><b>Управлять документацией Qt4</b><p>Показывает диалог управления документацией Qt4.</p></translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="1653"/> - <source>&Window</source> - <translation>&Окно</translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="1722"/> - <source>Filter</source> - <translation>Фильтр</translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="1727"/> - <source>Filtered by: </source> - <translation>Фильтровать по:</translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="2653"/> - <source>Could not find an associated content.</source> - <translation>Невозможно найти соответствующее содержание.</translation> - </message> - <message> <location filename="../Helpviewer/HelpWindow.py" line="1253"/> + <source><b>Manage QtHelp Documents</b><p>Shows a dialog to manage the QtHelp documentation set.</p></source> + <translation><b>Управлять документацией Qt4</b><p>Показывает диалог управления документацией Qt4.</p></translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="1663"/> + <source>&Window</source> + <translation>&Окно</translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="1732"/> + <source>Filter</source> + <translation>Фильтр</translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="1737"/> + <source>Filtered by: </source> + <translation>Фильтровать по:</translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="2665"/> + <source>Could not find an associated content.</source> + <translation>Невозможно найти соответствующее содержание.</translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="1263"/> <source>Manage QtHelp Filters</source> <translation>Управлять фильтрами документации QtHelp</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1257"/> + <location filename="../Helpviewer/HelpWindow.py" line="1267"/> <source>Shows a dialog to manage the QtHelp filters</source> <translation>Показывает диалог управления фильтрами документации QtHelp</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1259"/> + <location filename="../Helpviewer/HelpWindow.py" line="1269"/> <source><b>Manage QtHelp Filters</b><p>Shows a dialog to manage the QtHelp filters.</p></source> <translation><b>Управлять фильтрами документации QtHelp</b><p>Показывает диалог управления фильтрами документации QtHelp.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1208"/> + <location filename="../Helpviewer/HelpWindow.py" line="1218"/> <source>Index</source> <translation>Индекс</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1212"/> - <source>Shows the index window</source> - <translation>Показать окно индексов</translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="1214"/> - <source><b>Index</b><p>Shows the index window.</p></source> - <translation><b>Индекс</b><p>Показать окно индексов.</p></translation> - </message> - <message> <location filename="../Helpviewer/HelpWindow.py" line="1222"/> + <source>Shows the index window</source> + <translation>Показать окно индексов</translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="1224"/> + <source><b>Index</b><p>Shows the index window.</p></source> + <translation><b>Индекс</b><p>Показать окно индексов.</p></translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="1232"/> <source>Search</source> <translation>Поиск</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1226"/> + <location filename="../Helpviewer/HelpWindow.py" line="1236"/> <source>Shows the search window</source> <translation>Показать окно поиска</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1228"/> + <location filename="../Helpviewer/HelpWindow.py" line="1238"/> <source><b>Search</b><p>Shows the search window.</p></source> <translation><b>Поиск</b><p>Показать окно поиска.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1268"/> + <location filename="../Helpviewer/HelpWindow.py" line="1278"/> <source>Reindex Documentation</source> <translation>Переиндексировать документацию</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1272"/> + <location filename="../Helpviewer/HelpWindow.py" line="1282"/> <source>Reindexes the documentation set</source> <translation>Переиндексировать документацию</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1274"/> + <location filename="../Helpviewer/HelpWindow.py" line="1284"/> <source><b>Reindex Documentation</b><p>Reindexes the documentation set.</p></source> <translation><b>Переиндексировать документацию</b><p>Переиндексировать документацию.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="2776"/> + <location filename="../Helpviewer/HelpWindow.py" line="2788"/> <source>Updating search index</source> <translation>Обновление поискового индекса</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="2846"/> + <location filename="../Helpviewer/HelpWindow.py" line="2858"/> <source>Looking for Documentation...</source> <translation>Идёт поиск помощи...</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="2881"/> + <location filename="../Helpviewer/HelpWindow.py" line="2893"/> <source>Unfiltered</source> <translation>Нефильтрованное</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="2900"/> + <location filename="../Helpviewer/HelpWindow.py" line="2912"/> <source>Help Engine</source> <translation>Просмотрщик помощи</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="649"/> + <location filename="../Helpviewer/HelpWindow.py" line="659"/> <source>Private Browsing</source> <translation>Личный просмотр</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="644"/> + <location filename="../Helpviewer/HelpWindow.py" line="654"/> <source>Private &Browsing</source> <translation>Личный &просмотр</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="650"/> + <location filename="../Helpviewer/HelpWindow.py" line="660"/> <source><b>Private Browsing</b><p>Enables private browsing. In this mode no history is recorded anymore.</p></source> <translation><b>Личный просмотр</b><p>Разрешает режим личного просмотра. В этом режиме история не сохраняется.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="2350"/> + <location filename="../Helpviewer/HelpWindow.py" line="2362"/> <source>Full Screen</source> <translation>Полный экран</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1020"/> + <location filename="../Helpviewer/HelpWindow.py" line="1030"/> <source>&Full Screen</source> <translation>Полный &экран</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1020"/> + <location filename="../Helpviewer/HelpWindow.py" line="1030"/> <source>F11</source> <translation>F11</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1237"/> + <location filename="../Helpviewer/HelpWindow.py" line="1247"/> <source>Manage QtHelp &Documents</source> <translation>Управлять &документацией QtHelp</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1253"/> + <location filename="../Helpviewer/HelpWindow.py" line="1263"/> <source>Manage QtHelp &Filters</source> <translation>Управлять &фильтрами документации QtHelp</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1268"/> + <location filename="../Helpviewer/HelpWindow.py" line="1278"/> <source>&Reindex Documentation</source> <translation>&Переиндексировать документацию</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1288"/> + <location filename="../Helpviewer/HelpWindow.py" line="1298"/> <source>Clear private data</source> <translation>Очистить личные данные</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1283"/> + <location filename="../Helpviewer/HelpWindow.py" line="1293"/> <source>&Clear private data</source> <translation>&Очистить личные данные</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1290"/> - <source><b>Clear private data</b><p>Clears the private data like browsing history, search history or the favicons database.</p></source> - <translation><b>Очистить личные данные</b><p>Очистить личные данные: удалить историю просмотров, историю поиска или базу данных иконок.</p></translation> - </message> - <message> <location filename="../Helpviewer/HelpWindow.py" line="1300"/> + <source><b>Clear private data</b><p>Clears the private data like browsing history, search history or the favicons database.</p></source> + <translation><b>Очистить личные данные</b><p>Очистить личные данные: удалить историю просмотров, историю поиска или базу данных иконок.</p></translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="1310"/> <source>Clear &icons database</source> <translation>Очистить базу данных &иконок</translation> </message> @@ -18925,7 +19064,7 @@ <translation type="obsolete">Показать монитор &сети</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1408"/> + <location filename="../Helpviewer/HelpWindow.py" line="1418"/> <source>Show the network monitor dialog</source> <translation>Показать диалог монитора сети</translation> </message> @@ -18935,298 +19074,298 @@ <translation type="obsolete"><b>Показать монитор сети</b><p>Показать диалог монитора сети.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1606"/> + <location filename="../Helpviewer/HelpWindow.py" line="1616"/> <source>&Settings</source> <translation>&Настройка</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1644"/> + <location filename="../Helpviewer/HelpWindow.py" line="1654"/> <source>&Tools</source> <translation>&Инструменты</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1004"/> + <location filename="../Helpviewer/HelpWindow.py" line="1014"/> <source>Show page source</source> <translation>Показать исходный текст страницы</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1004"/> + <location filename="../Helpviewer/HelpWindow.py" line="1014"/> <source>Ctrl+U</source> <translation>Ctrl+U</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1009"/> + <location filename="../Helpviewer/HelpWindow.py" line="1019"/> <source>Show the page source in an editor</source> <translation>Показать исходный текст страницы в редакторе</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1011"/> + <location filename="../Helpviewer/HelpWindow.py" line="1021"/> <source><b>Show page source</b><p>Show the page source in an editor.</p></source> <translation><b>Показать исходный текст страницы</b><p>Показать исходный текст страницы в редакторе.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1076"/> + <location filename="../Helpviewer/HelpWindow.py" line="1086"/> <source>&Languages...</source> <translation>&Языки...</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1081"/> + <location filename="../Helpviewer/HelpWindow.py" line="1091"/> <source>Configure the accepted languages for web pages</source> <translation>Настроить допустимые языки для WEB страниц</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1083"/> + <location filename="../Helpviewer/HelpWindow.py" line="1093"/> <source><b>Languages</b><p>Configure the accepted languages for web pages.</p></source> <translation><b>Языки</b><p>Настроить допустимые языки для WEB страниц.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1076"/> + <location filename="../Helpviewer/HelpWindow.py" line="1086"/> <source>Languages</source> <translation>Языки</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1092"/> + <location filename="../Helpviewer/HelpWindow.py" line="1102"/> <source>Cookies</source> <translation>Cookies</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1092"/> + <location filename="../Helpviewer/HelpWindow.py" line="1102"/> <source>C&ookies...</source> <translation>C&ookies...</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1096"/> + <location filename="../Helpviewer/HelpWindow.py" line="1106"/> <source>Configure cookies handling</source> <translation>Настройка cookies</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1098"/> + <location filename="../Helpviewer/HelpWindow.py" line="1108"/> <source><b>Cookies</b><p>Configure cookies handling.</p></source> <translation><b>Cookies</b><p>Настройка cookies.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1734"/> + <location filename="../Helpviewer/HelpWindow.py" line="1744"/> <source>Settings</source> <translation>Настройка</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="968"/> + <location filename="../Helpviewer/HelpWindow.py" line="978"/> <source>Zoom reset</source> <translation>Сбросить масштаб</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="968"/> + <location filename="../Helpviewer/HelpWindow.py" line="978"/> <source>Zoom &reset</source> <translation>&Сбросить масштаб</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="968"/> + <location filename="../Helpviewer/HelpWindow.py" line="978"/> <source>Ctrl+0</source> <comment>View|Zoom reset</comment> <translation>Ctrl+0</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="974"/> + <location filename="../Helpviewer/HelpWindow.py" line="984"/> <source>Reset the zoom of the text</source> <translation>Сбросить масштаб</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="986"/> + <location filename="../Helpviewer/HelpWindow.py" line="996"/> <source>Zoom text only</source> <translation>Масштаб текста</translation> </message> <message> + <location filename="../Helpviewer/HelpWindow.py" line="996"/> + <source>Zoom &text only</source> + <translation>Масштаб &текста</translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="1001"/> + <source>Zoom text only; pictures remain constant</source> + <translation>Масштаб текста; Изображения остаются неизменными</translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="1003"/> + <source><b>Zoom text only</b><p>Zoom text only; pictures remain constant.</p></source> + <translation><b>Масштаб текста</b><p>Масштаб текста; Изображения остаются неизменными.</p></translation> + </message> + <message> <location filename="../Helpviewer/HelpWindow.py" line="986"/> - <source>Zoom &text only</source> - <translation>Масштаб &текста</translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="991"/> - <source>Zoom text only; pictures remain constant</source> - <translation>Масштаб текста; Изображения остаются неизменными</translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="993"/> - <source><b>Zoom text only</b><p>Zoom text only; pictures remain constant.</p></source> - <translation><b>Масштаб текста</b><p>Масштаб текста; Изображения остаются неизменными.</p></translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="976"/> <source><b>Zoom reset</b><p>Reset the zoom of the text. This sets the zoom factor to 100%.</p></source> <translation><b>Сбросить масштаб</b><p>Сбросить масштаб текста, т.е. установить масштаб в 100%.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="439"/> + <location filename="../Helpviewer/HelpWindow.py" line="449"/> <source>New &Window</source> <translation>&Новое окно</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="537"/> + <location filename="../Helpviewer/HelpWindow.py" line="547"/> <source>Import Bookmarks</source> <translation>Импортировать закладки</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="537"/> + <location filename="../Helpviewer/HelpWindow.py" line="547"/> <source>&Import Bookmarks...</source> <translation>&Импортировать закладки...</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="541"/> + <location filename="../Helpviewer/HelpWindow.py" line="551"/> <source>Import bookmarks from other browsers</source> <translation>Импортировать закладки из других браузеров</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="543"/> + <location filename="../Helpviewer/HelpWindow.py" line="553"/> <source><b>Import Bookmarks</b><p>Import bookmarks from other browsers.</p></source> <translation><b>Импортировать закладки</b><p>Импортировать закладки из других браузеров.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="552"/> + <location filename="../Helpviewer/HelpWindow.py" line="562"/> <source>Export Bookmarks</source> <translation>Экспорт закладок</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="552"/> + <location filename="../Helpviewer/HelpWindow.py" line="562"/> <source>&Export Bookmarks...</source> <translation>&Экспорт закладок...</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="556"/> + <location filename="../Helpviewer/HelpWindow.py" line="566"/> <source>Export the bookmarks into a file</source> <translation>Экспортировать закладки в файл</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="558"/> + <location filename="../Helpviewer/HelpWindow.py" line="568"/> <source><b>Export Bookmarks</b><p>Export the bookmarks into a file.</p></source> <translation><b>Экспорт закладок</b><p>Экспортировать закладки в файл.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="826"/> + <location filename="../Helpviewer/HelpWindow.py" line="836"/> <source>Manage Bookmarks</source> <translation>Управлять закладками</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="826"/> + <location filename="../Helpviewer/HelpWindow.py" line="836"/> <source>&Manage Bookmarks...</source> <translation>&Управлять закладками...</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="826"/> + <location filename="../Helpviewer/HelpWindow.py" line="836"/> <source>Ctrl+Shift+B</source> <comment>Help|Manage bookmarks</comment> <translation>Ctrl+Shift+B</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="831"/> + <location filename="../Helpviewer/HelpWindow.py" line="841"/> <source>Open a dialog to manage the bookmarks.</source> <translation>Показать диалог управления закладками.</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="833"/> + <location filename="../Helpviewer/HelpWindow.py" line="843"/> <source><b>Manage Bookmarks...</b><p>Open a dialog to manage the bookmarks.</p></source> <translation><b>Управлять закладками...</b><p>Показать диалог управления закладками.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="842"/> + <location filename="../Helpviewer/HelpWindow.py" line="852"/> <source>Add &Bookmark...</source> <translation>Добавить &закладку...</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="842"/> + <location filename="../Helpviewer/HelpWindow.py" line="852"/> <source>Ctrl+D</source> <comment>Help|Add bookmark</comment> <translation>Ctrl+D</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="849"/> - <source>Open a dialog to add a bookmark.</source> - <translation>Показать диалог добавления закладки.</translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="851"/> - <source><b>Add Bookmark</b><p>Open a dialog to add the current URL as a bookmark.</p></source> - <translation><b>Добавить закладку</b><p>Показать диалог добавления текущей страницы в закладки.</p></translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="859"/> - <source>Add Folder</source> - <translation>Добавить папку</translation> - </message> - <message> <location filename="../Helpviewer/HelpWindow.py" line="859"/> + <source>Open a dialog to add a bookmark.</source> + <translation>Показать диалог добавления закладки.</translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="861"/> + <source><b>Add Bookmark</b><p>Open a dialog to add the current URL as a bookmark.</p></source> + <translation><b>Добавить закладку</b><p>Показать диалог добавления текущей страницы в закладки.</p></translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="869"/> + <source>Add Folder</source> + <translation>Добавить папку</translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="869"/> <source>Add &Folder...</source> <translation>Добавить &папку...</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="863"/> + <location filename="../Helpviewer/HelpWindow.py" line="873"/> <source>Open a dialog to add a new bookmarks folder.</source> <translation>Показать диалог добавления новой папки закладок.</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="865"/> + <location filename="../Helpviewer/HelpWindow.py" line="875"/> <source><b>Add Folder...</b><p>Open a dialog to add a new bookmarks folder.</p></source> <translation><b>Добавить папку</b><p>Показать диалог добавления новой папки закладок.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="874"/> + <location filename="../Helpviewer/HelpWindow.py" line="884"/> <source>Bookmark All Tabs</source> <translation>Создать закладки для всех открытых страниц</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="874"/> + <location filename="../Helpviewer/HelpWindow.py" line="884"/> <source>Bookmark All Tabs...</source> <translation>Создать закладки для всех открытых страниц...</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="878"/> + <location filename="../Helpviewer/HelpWindow.py" line="888"/> <source>Bookmark all open tabs.</source> <translation>Создать закладки для всех открытых страниц.</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="880"/> + <location filename="../Helpviewer/HelpWindow.py" line="890"/> <source><b>Bookmark All Tabs...</b><p>Open a dialog to add a new bookmarks folder for all open tabs.</p></source> <translation><b>Создать закладки для всех открытых страниц...</b><p>Показать диалог добавления папки для закладок.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="2149"/> + <location filename="../Helpviewer/HelpWindow.py" line="2161"/> <source>Saved Tabs</source> <translation>Сохраненные закладки</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="730"/> + <location filename="../Helpviewer/HelpWindow.py" line="740"/> <source>F5</source> <comment>Go|Reload</comment> <translation>F5</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="747"/> + <location filename="../Helpviewer/HelpWindow.py" line="757"/> <source>Stop</source> <translation>Стоп</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="747"/> + <location filename="../Helpviewer/HelpWindow.py" line="757"/> <source>&Stop</source> <translation>Ст&оп</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="747"/> + <location filename="../Helpviewer/HelpWindow.py" line="757"/> <source>Ctrl+.</source> <comment>Go|Stop</comment> <translation>Ctrl+.</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="747"/> + <location filename="../Helpviewer/HelpWindow.py" line="757"/> <source>Esc</source> <comment>Go|Stop</comment> <translation>Esc</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="754"/> + <location filename="../Helpviewer/HelpWindow.py" line="764"/> <source>Stop loading</source> <translation>Остановить загрузку</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="755"/> + <location filename="../Helpviewer/HelpWindow.py" line="765"/> <source><b>Stop</b><p>Stops loading of the current tab.</p></source> <translation><b>Стоп</b><p>Остановить загрузку.</p></translation> </message> @@ -19236,23 +19375,23 @@ <translation type="obsolete">Сохранить как</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="487"/> + <location filename="../Helpviewer/HelpWindow.py" line="497"/> <source>&Save As...</source> <translation>Сохранить &как...</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="487"/> + <location filename="../Helpviewer/HelpWindow.py" line="497"/> <source>Shift+Ctrl+S</source> <comment>File|Save As</comment> <translation>Shift+Ctrl+S</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="493"/> + <location filename="../Helpviewer/HelpWindow.py" line="503"/> <source>Save the current page to disk</source> <translation>Сохранить текущую страницу в файл</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="495"/> + <location filename="../Helpviewer/HelpWindow.py" line="505"/> <source><b>Save As...</b><p>Saves the current page to disk.</p></source> <translation><b>Сохранить как...</b><p>Сохранить текущую страницу в файл.</p></translation> </message> @@ -19277,162 +19416,162 @@ <translation type="obsolete"><b>Выход</b><p>Закрыть просмотрщик Web.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1316"/> + <location filename="../Helpviewer/HelpWindow.py" line="1326"/> <source>Configure Search Engines</source> <translation>Настройка поисковиков</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1321"/> + <location filename="../Helpviewer/HelpWindow.py" line="1331"/> <source>Configure the available search engines</source> <translation>Настроить все поисковики</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1323"/> - <source><b>Configure Search Engines...</b><p>Opens a dialog to configure the available search engines.</p></source> - <translation><b>Настроить все поисковики...</b><p>Открыть диалог для настройки поисковиков.</p></translation> - </message> - <message> <location filename="../Helpviewer/HelpWindow.py" line="1333"/> + <source><b>Configure Search Engines...</b><p>Opens a dialog to configure the available search engines.</p></source> + <translation><b>Настроить все поисковики...</b><p>Открыть диалог для настройки поисковиков.</p></translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="1343"/> <source>Manage Saved Passwords</source> <translation>Менеджировать сохранённые пароли</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1333"/> + <location filename="../Helpviewer/HelpWindow.py" line="1343"/> <source>Manage Saved Passwords...</source> <translation>Менеджировать сохранённые пароли...</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1339"/> - <source>Manage the saved passwords</source> - <translation>Менеджировать сохранённые пароли</translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="1341"/> - <source><b>Manage Saved Passwords...</b><p>Opens a dialog to manage the saved passwords.</p></source> - <translation><b>Менеджировать сохранённые пароли...</b>Открыть диалог для менеджирования сохранённых паролей<p></translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="1349"/> - <source>Ad Block</source> - <translation>Ad Block</translation> - </message> - <message> <location filename="../Helpviewer/HelpWindow.py" line="1349"/> + <source>Manage the saved passwords</source> + <translation>Менеджировать сохранённые пароли</translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="1351"/> + <source><b>Manage Saved Passwords...</b><p>Opens a dialog to manage the saved passwords.</p></source> + <translation><b>Менеджировать сохранённые пароли...</b>Открыть диалог для менеджирования сохранённых паролей<p></translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="1359"/> + <source>Ad Block</source> + <translation>Ad Block</translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="1359"/> <source>&Ad Block...</source> <translation>&Ad Block...</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1355"/> + <location filename="../Helpviewer/HelpWindow.py" line="1365"/> <source>Configure AdBlock subscriptions and rules</source> <translation>Настроить AdBlock подписки и правила</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1357"/> + <location filename="../Helpviewer/HelpWindow.py" line="1367"/> <source><b>Ad Block...</b><p>Opens a dialog to configure AdBlock subscriptions and rules.</p></source> <translation><b>Ad Block...</b><p>Показать диалог для настройки AdBlock подписок и правил.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="2856"/> + <location filename="../Helpviewer/HelpWindow.py" line="2868"/> <source>eric5 Web Browser</source> <translation>WEB просмотрщик встроенный в Eric5</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="582"/> + <location filename="../Helpviewer/HelpWindow.py" line="592"/> <source>Print as PDF</source> <translation>Печать как PDF</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="587"/> + <location filename="../Helpviewer/HelpWindow.py" line="597"/> <source>Print the displayed help as PDF</source> <translation>Печатать текущий раздел помощи как PDF</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="589"/> + <location filename="../Helpviewer/HelpWindow.py" line="599"/> <source><b>Print as PDF</b><p>Print the displayed help text as a PDF file.</p></source> <translation><b>Печать как PDF</b><p>Печатать текущий раздел помощи как PDF</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1107"/> + <location filename="../Helpviewer/HelpWindow.py" line="1117"/> <source>Offline Storage</source> <translation>Автономное хранилище</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1107"/> + <location filename="../Helpviewer/HelpWindow.py" line="1117"/> <source>Offline &Storage...</source> <translation>Автономное &хранилище...</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1112"/> + <location filename="../Helpviewer/HelpWindow.py" line="1122"/> <source>Configure offline storage</source> <translation>Настройка автономного хранилища</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1114"/> + <location filename="../Helpviewer/HelpWindow.py" line="1124"/> <source><b>Offline Storage</b><p>Opens a dialog to configure offline storage.</p></source> <translation>Offline Storage<b></b><p>Настройка автономного хранилища.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1316"/> + <location filename="../Helpviewer/HelpWindow.py" line="1326"/> <source>Configure Search &Engines...</source> <translation>Настройка &поисковиков...</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="2380"/> + <location filename="../Helpviewer/HelpWindow.py" line="2392"/> <source><b>Are you sure you want to turn on private browsing?</b><p>When private browsing is turned on, web pages are not added to the history, searches are not added to the list of recent searches and web site icons and cookies are not stored. HTML5 offline storage will be deactivated. Until you close the window, you can still click the Back and Forward buttons to return to the web pages you have opened.</p></source> <translation><b>Подтвердите включение закрытого режима.</b><p>В закрытом режиме посещённые WEB страницы не сохраняются в истории, поиски не сохраняються в списке последних поисков, иконки сайтов и cookies так же не сохраняются. HTML5 автономное хранилище будет выключено. Пока текущее окно не закрыто, переход вперёд и назад на просмотренные уже страницы всё же будет работать.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1562"/> + <location filename="../Helpviewer/HelpWindow.py" line="1572"/> <source>Text Encoding</source> <translation>Кодировка текста</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="3331"/> + <location filename="../Helpviewer/HelpWindow.py" line="3343"/> <source>ISO</source> <translation></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="3332"/> + <location filename="../Helpviewer/HelpWindow.py" line="3344"/> <source>Windows</source> <translation>Windows</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="3333"/> + <location filename="../Helpviewer/HelpWindow.py" line="3345"/> <source>ISCII</source> <translation></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="3334"/> + <location filename="../Helpviewer/HelpWindow.py" line="3346"/> <source>Unicode</source> <translation>Юникод</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="3335"/> + <location filename="../Helpviewer/HelpWindow.py" line="3347"/> <source>Other</source> <translation>Другое</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="3336"/> + <location filename="../Helpviewer/HelpWindow.py" line="3348"/> <source>IBM</source> <translation></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="3358"/> + <location filename="../Helpviewer/HelpWindow.py" line="3370"/> <source>Default Encoding</source> <translation>Кодировка по умолчанию</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1419"/> + <location filename="../Helpviewer/HelpWindow.py" line="1429"/> <source>Downloads</source> <translation>Загрузки</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1423"/> + <location filename="../Helpviewer/HelpWindow.py" line="1433"/> <source>Shows the downloads window</source> <translation>Показать окно загрузки</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1425"/> + <location filename="../Helpviewer/HelpWindow.py" line="1435"/> <source><b>Downloads</b><p>Shows the downloads window.</p></source> <translation><b>Загрузки</b><p>Показать окно загрузки.</p></translation> </message> @@ -19457,267 +19596,267 @@ <translation type="obsolete"><b>Управлять сохранёнными сертификатами</b><p>Показывает диалог управления сохранёнными сертификатами.</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1812"/> + <location filename="../Helpviewer/HelpWindow.py" line="1822"/> <source>VirusTotal</source> <translation>VirusTotal</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1818"/> + <location filename="../Helpviewer/HelpWindow.py" line="1828"/> <source><h2>File search</h2><p>In order to search for the last VirusTotal report on a given file just enter its hash. Currently the allowed hashes are MD5, SHA1 and SHA256. You can also search for a particular file report by typing in its permalink id.</p><h2>URL search</h2><p>URL searches are simple, just type in the given URL, the application will normalize it and compare it with the entries in VirusTotal's database. Alternatively you may enter the MD5 hash of an URL preceded by "url:", e.g. url:7f911bbcf618f052ac6b9928600d2820.</p><h2>User search</h2><p>Do you want to know whether a friend has a VT Community account? Simply type in his nick preceded by the symbol "@", e.g. @EmilianoMartinez.</p><h2>Search through comments</h2><p>The comments in VT Community may often help in disinfecting your PC or may proof themselves useful when analysing a particular malware sample, comment tags enable users to search through the VT Community reviews. The standard file tags are: {0} The standard URL tags are: {1}User generated tags are preceded by the symbol "#", e.g. #disinfect.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1866"/> + <location filename="../Helpviewer/HelpWindow.py" line="1876"/> <source>Search VirusTotal</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1872"/> + <location filename="../Helpviewer/HelpWindow.py" line="1882"/> <source>Scan current site</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="3618"/> + <location filename="../Helpviewer/HelpWindow.py" line="3629"/> <source>VirusTotal Scan</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="3618"/> + <location filename="../Helpviewer/HelpWindow.py" line="3629"/> <source><p>The VirusTotal scan could not be scheduled.<p> <p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="667"/> + <location filename="../Helpviewer/HelpWindow.py" line="677"/> <source>Quit the eric5 Web Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="668"/> + <location filename="../Helpviewer/HelpWindow.py" line="678"/> <source><b>Quit</b><p>Quit the eric5 Web Browser.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1434"/> + <location filename="../Helpviewer/HelpWindow.py" line="1444"/> <source>RSS Feeds Dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1434"/> + <location filename="../Helpviewer/HelpWindow.py" line="1444"/> <source>&RSS Feeds Dialog...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1434"/> + <location filename="../Helpviewer/HelpWindow.py" line="1444"/> <source>Ctrl+Shift+F</source> <comment>Help|RSS Feeds Dialog</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1440"/> + <location filename="../Helpviewer/HelpWindow.py" line="1450"/> <source>Open a dialog showing the configured RSS feeds.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1442"/> - <source><b>RSS Feeds Dialog...</b><p>Open a dialog to show the configured RSS feeds. It can be used to mange the feeds and to show their contents.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="1452"/> - <source>Siteinfo Dialog</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Helpviewer/HelpWindow.py" line="1452"/> - <source>&Siteinfo Dialog...</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Helpviewer/HelpWindow.py" line="1452"/> + <source><b>RSS Feeds Dialog...</b><p>Open a dialog to show the configured RSS feeds. It can be used to mange the feeds and to show their contents.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="1462"/> + <source>Siteinfo Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="1462"/> + <source>&Siteinfo Dialog...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="1462"/> <source>Ctrl+Shift+I</source> <comment>Help|Siteinfo Dialog</comment> <translation>Ctrl+Shift+I</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1458"/> + <location filename="../Helpviewer/HelpWindow.py" line="1468"/> <source>Open a dialog showing some information about the current site.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1460"/> + <location filename="../Helpviewer/HelpWindow.py" line="1470"/> <source><b>Siteinfo Dialog...</b><p>Opens a dialog showing some information about the current site.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1744"/> + <location filename="../Helpviewer/HelpWindow.py" line="1754"/> <source>Tools</source> <translation>Инструменты</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="936"/> + <location filename="../Helpviewer/HelpWindow.py" line="946"/> <source>Zoom In</source> <comment>View|Zoom in</comment> <translation>Увеличить масштаб</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="952"/> + <location filename="../Helpviewer/HelpWindow.py" line="962"/> <source>Zoom Out</source> <comment>View|Zoom out</comment> <translation>Уменьшить масштаб</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1403"/> + <location filename="../Helpviewer/HelpWindow.py" line="1413"/> <source>Network Monitor</source> <translation>Монитор сети</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1403"/> + <location filename="../Helpviewer/HelpWindow.py" line="1413"/> <source>&Network Monitor...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1410"/> + <location filename="../Helpviewer/HelpWindow.py" line="1420"/> <source><b>Network Monitor...</b><p>Shows the network monitor dialog.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="2054"/> + <location filename="../Helpviewer/HelpWindow.py" line="2067"/> <source><b>eric5 Web Browser - {0}</b><p>The eric5 Web Browser is a combined help file and HTML browser. It is part of the eric5 development toolset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="2357"/> + <location filename="../Helpviewer/HelpWindow.py" line="2369"/> <source>Restore Window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1469"/> + <location filename="../Helpviewer/HelpWindow.py" line="1479"/> <source>Manage User Agent Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1469"/> + <location filename="../Helpviewer/HelpWindow.py" line="1479"/> <source>Manage &User Agent Settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1473"/> + <location filename="../Helpviewer/HelpWindow.py" line="1483"/> <source>Shows a dialog to manage the User Agent settings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1475"/> + <location filename="../Helpviewer/HelpWindow.py" line="1485"/> <source><b>Manage User Agent Settings</b><p>Shows a dialog to manage the User Agent settings.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1631"/> + <location filename="../Helpviewer/HelpWindow.py" line="1641"/> <source>Global User Agent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="487"/> + <location filename="../Helpviewer/HelpWindow.py" line="497"/> <source>Save As</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="503"/> + <location filename="../Helpviewer/HelpWindow.py" line="513"/> <source>Save Page Screen</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="503"/> + <location filename="../Helpviewer/HelpWindow.py" line="513"/> <source>Save Page Screen...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="508"/> + <location filename="../Helpviewer/HelpWindow.py" line="518"/> <source>Save the current page as a screen shot</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="510"/> + <location filename="../Helpviewer/HelpWindow.py" line="520"/> <source><b>Save Page Screen...</b><p>Saves the current page as a screen shot.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1484"/> + <location filename="../Helpviewer/HelpWindow.py" line="1494"/> <source>Synchronize data</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1484"/> + <location filename="../Helpviewer/HelpWindow.py" line="1494"/> <source>&Synchronize Data...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1489"/> + <location filename="../Helpviewer/HelpWindow.py" line="1499"/> <source>Shows a dialog to synchronize data via the network</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1491"/> + <location filename="../Helpviewer/HelpWindow.py" line="1501"/> <source><b>Synchronize Data...</b><p>This shows a dialog to synchronize data via the network.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1366"/> + <location filename="../Helpviewer/HelpWindow.py" line="1376"/> <source>ClickToFlash</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1366"/> + <location filename="../Helpviewer/HelpWindow.py" line="1376"/> <source>&ClickToFlash...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1372"/> + <location filename="../Helpviewer/HelpWindow.py" line="1382"/> <source>Configure ClickToFlash whitelist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1374"/> + <location filename="../Helpviewer/HelpWindow.py" line="1384"/> <source><b>ClickToFlash...</b><p>Opens a dialog to configure the ClickToFlash whitelist.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1123"/> + <location filename="../Helpviewer/HelpWindow.py" line="1133"/> <source>Personal Information</source> <translation type="unfinished">Личная информация</translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1123"/> + <location filename="../Helpviewer/HelpWindow.py" line="1133"/> <source>Personal Information...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1129"/> + <location filename="../Helpviewer/HelpWindow.py" line="1139"/> <source>Configure personal information for completing form fields</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1131"/> - <source><b>Personal Information...</b><p>Opens a dialog to configure the personal information used for completing form fields.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Helpviewer/HelpWindow.py" line="1141"/> + <source><b>Personal Information...</b><p>Opens a dialog to configure the personal information used for completing form fields.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Helpviewer/HelpWindow.py" line="1151"/> <source>GreaseMonkey Scripts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1141"/> + <location filename="../Helpviewer/HelpWindow.py" line="1151"/> <source>GreaseMonkey Scripts...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1147"/> + <location filename="../Helpviewer/HelpWindow.py" line="1157"/> <source>Configure the GreaseMonkey Scripts</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1149"/> + <location filename="../Helpviewer/HelpWindow.py" line="1159"/> <source><b>GreaseMonkey Scripts...</b><p>Opens a dialog to configure the available GreaseMonkey Scripts.</p></source> <translation type="unfinished"></translation> </message> @@ -19732,62 +19871,62 @@ <translation type="obsolete"><p>Невозможно прочитать файл таблиц стилей Qt <b>{0}</b>.<br>{1}</p></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1385"/> + <location filename="../Helpviewer/HelpWindow.py" line="1395"/> <source>Manage SSL Certificates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1385"/> + <location filename="../Helpviewer/HelpWindow.py" line="1395"/> <source>Manage SSL Certificates...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1391"/> + <location filename="../Helpviewer/HelpWindow.py" line="1401"/> <source>Manage the saved SSL certificates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1393"/> + <location filename="../Helpviewer/HelpWindow.py" line="1403"/> <source><b>Manage SSL Certificates...</b><p>Opens a dialog to manage the saved SSL certificates.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1159"/> + <location filename="../Helpviewer/HelpWindow.py" line="1169"/> <source>Edit Message Filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1159"/> + <location filename="../Helpviewer/HelpWindow.py" line="1169"/> <source>Edit Message Filters...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1164"/> + <location filename="../Helpviewer/HelpWindow.py" line="1174"/> <source>Edit the message filters used to suppress unwanted messages</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="1166"/> + <location filename="../Helpviewer/HelpWindow.py" line="1176"/> <source><b>Edit Message Filters</b><p>Opens a dialog to edit the message filters used to suppress unwanted messages been shown in an error window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="518"/> + <location filename="../Helpviewer/HelpWindow.py" line="528"/> <source>Save Visible Page Screen</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="518"/> + <location filename="../Helpviewer/HelpWindow.py" line="528"/> <source>Save Visible Page Screen...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="523"/> + <location filename="../Helpviewer/HelpWindow.py" line="533"/> <source>Save the visible part of the current page as a screen shot</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/HelpWindow.py" line="526"/> + <location filename="../Helpviewer/HelpWindow.py" line="536"/> <source><b>Save Visible Page Screen...</b><p>Saves the visible part of the current page as a screen shot.</p></source> <translation type="unfinished"></translation> </message> @@ -19795,42 +19934,42 @@ <context> <name>Hg</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="230"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="268"/> <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="1753"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1784"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="275"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="265"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> <source>Create project repository</source> <translation>Создать репозиторий проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="265"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="303"/> <source>The project repository could not be created.</source> <translation>Не могу создать репозиторий проекта.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="332"/> <source>Creating Mercurial repository</source> <translation>Создание репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="348"/> <source>Initial commit to Mercurial repository</source> <translation>Первичная подача в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="396"/> <source>Cloning project from a Mercurial repository</source> <translation>Создание копии репозитория</translation> </message> @@ -19840,32 +19979,32 @@ <translation type="obsolete">Подача изменений в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="580"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="609"/> <source>Synchronizing with the Mercurial repository</source> <translation>Синхронизация с репозиторием</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="659"/> <source>Adding files/directories to the Mercurial repository</source> <translation>Добавление файлов/каталогов в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="729"/> <source>Removing files/directories from the Mercurial repository</source> <translation>Удаление файлов/каталогов из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="774"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="791"/> <source>Renaming {0}</source> <translation>Переименование {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1035"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1064"/> <source>Merging</source> <translation>Слияние</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1512"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1539"/> <source>Copying {0}</source> <translation>Копирование {0}</translation> </message> @@ -19880,290 +20019,305 @@ <translation type="obsolete">Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1908"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1945"/> <source>Pulling from a remote Mercurial repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1961"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1995"/> <source>Pushing to a remote Mercurial repository</source> <translation>Загрузка изменений в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2093"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2123"/> <source>Resolving files/directories</source> <translation>Разрешение конфликтов</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="925"/> <source>Taging in the Mercurial repository</source> - <translation>Создание меток в репозитории</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="980"/> + <translation type="obsolete">Создание меток в репозитории</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1013"/> <source>Reverting changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1319"/> <source>Mercurial command</source> <translation>Mercurial команда</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source>Create Branch</source> - <translation>Создать ветвь</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2114"/> + <translation type="obsolete">Создать ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2140"/> <source>Enter branch name</source> - <translation>Введите имя ветви</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2125"/> + <translation type="obsolete">Введите имя ветви</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2152"/> <source>Creating branch in the Mercurial repository</source> <translation>Создание ветвив репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2305"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Проверка целостности репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2330"/> <source>Showing the combined configuration settings</source> <translation>Показ комбинированных настроек</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2268"/> - <source>Showing aliases for remote repositories</source> - <translation>Алиасы для удалённых репозиториев</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2293"/> - <source>Recovering from interrupted transaction</source> - <translation>Восстановление после прерванной транзакции</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2551"/> - <source>Shall the working directory be updated?</source> - <translation>Обновить рабочий каталог?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2150"/> - <source>Showing current branch</source> - <translation>Текущая ветвь</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2452"/> - <source>Create changegroup</source> - <translation>Создать группу изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2564"/> - <source>Apply changegroups</source> - <translation>Применить группу изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2582"/> - <source>Bisect subcommand ({0}) invalid.</source> - <translation>Неправильная подкоманда ({0}) для Bisect.</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2620"/> - <source>Mercurial Bisect ({0})</source> - <translation>Mercurial Bisect ({0})</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2508"/> - <source>Preview changegroup</source> - <translation>Предпросмотр группы изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2318"/> - <source>Identifying project directory</source> - <translation>Каталог проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> - <source>Create .hgignore file</source> - <translation>Создать файл .hgignore</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2354"/> + <source>Showing aliases for remote repositories</source> + <translation>Алиасы для удалённых репозиториев</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2378"/> + <source>Recovering from interrupted transaction</source> + <translation>Восстановление после прерванной транзакции</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> + <source>Shall the working directory be updated?</source> + <translation>Обновить рабочий каталог?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2181"/> + <source>Showing current branch</source> + <translation>Текущая ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2535"/> + <source>Create changegroup</source> + <translation>Создать группу изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2615"/> + <source>Apply changegroups</source> + <translation>Применить группу изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2633"/> + <source>Bisect subcommand ({0}) invalid.</source> + <translation>Неправильная подкоманда ({0}) для Bisect.</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2669"/> + <source>Mercurial Bisect ({0})</source> + <translation>Mercurial Bisect ({0})</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2556"/> + <source>Preview changegroup</source> + <translation>Предпросмотр группы изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2402"/> + <source>Identifying project directory</source> + <translation>Каталог проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> + <source>Create .hgignore file</source> + <translation>Создать файл .hgignore</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2438"/> <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="2654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2701"/> <source>Removing files from the Mercurial repository only</source> <translation>Удаление файлов только из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2492"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Mercurial файлы изменений (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2543"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2603"/> <source>Identifying changegroup file</source> - <translation>Файлы изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2715"/> + <translation type="obsolete">Файлы изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2761"/> <source>Backing out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2694"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2741"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2509"/> <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="2742"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2788"/> <source>Rollback last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2781"/> <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="525"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="557"/> <source>Committing changes to Mercurial repository</source> <translation>Фиксировать изменения в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3443"/> <source>Mercurial Command Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3189"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3277"/> <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="3329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3443"/> <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="2811"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2856"/> <source>Import Patch</source> <translation type="unfinished">Импортировать патч</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2859"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2903"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2950"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2961"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3003"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2988"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3029"/> <source>Copy Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3146"/> <source>Add Sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3179"/> <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="3087"/> - <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="3158"/> - <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="3158"/> - <source>Remove Sub-repositories</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3127"/> + <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="3198"/> + <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="3198"/> + <source>Remove Sub-repositories</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3167"/> <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="457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="492"/> <source>Commit Changes</source> <translation>Фиксировать изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="492"/> <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="974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1007"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="965"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="998"/> <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="974"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1007"/> <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="3024"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3064"/> <source>Create Unversioned Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> <source>Mercurial Side-by-Side Difference</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1861"/> <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="1756"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1787"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="957"/> + <source>Tagging in the Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2159"/> + <source>Created new branch <{0}>.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1095"/> + <source>Current branch tip</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgAddSubrepositoryDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="101"/> <source>Add Sub-repository</source> <translation></translation> </message> @@ -20183,27 +20337,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="54"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="51"/> <source>&Type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="66"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="63"/> <source>Select the type of the sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="88"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="85"/> <source>&URL:</source> <translation>&URL:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="95"/> <source>Enter the URL of the sub-repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="101"/> <source>The sub-repository path must be inside the project.</source> <translation type="unfinished"></translation> </message> @@ -20286,12 +20440,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="128"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py" line="128"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -20314,117 +20468,117 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.ui" line="37"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.ui" line="85"/> <source>Press to select the archive file name via a file selection dialog</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.ui" line="40"/> <source>...</source> - <translation type="unfinished">...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.ui" line="47"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.ui" line="37"/> <source>Type:</source> <translation type="unfinished">Тип:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.ui" line="54"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.ui" line="44"/> <source>Select the archive type</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.ui" line="61"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.ui" line="51"/> <source>Prefix:</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.ui" line="58"/> + <source>Enter the directory prefix for the files in the archive</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.ui" line="65"/> + <source>Select to recurse into subrepositories</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.ui" line="68"/> - <source>Enter the directory prefix for the files in the archive</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.ui" line="75"/> - <source>Select to recurse into subrepositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.ui" line="78"/> <source>Include Subrepositories</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="41"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="44"/> <source>Detect Automatically</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="43"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="46"/> <source>Directory of Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="45"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="48"/> <source>Uncompressed TAR-Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="47"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="50"/> <source>Bzip2 compressed TAR-Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="49"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="52"/> <source>Gzip compressed TAR-Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="51"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="54"/> <source>Uncompressed ZIP-Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="53"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="56"/> <source>Compressed ZIP-Archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="60"/> <source>Bzip2 compressed TAR-Archive (*.tar.bz2)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="61"/> <source>Gzip compressed TAR-Archive (*.tar.gz)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="59"/> - <source>Uncompressed TAR-Archive (*.tar)</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="62"/> + <source>Uncompressed TAR-Archive (*.tar)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="65"/> <source>Compressed ZIP-Archive (*.zip)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="63"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="66"/> <source>Uncompressed ZIP-Archive (*.uzip)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="74"/> <source>All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="109"/> - <source>Select Archive Directory</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="115"/> + <source>Select Archive Directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgArchiveDialog.py" line="121"/> <source>Select Archive File</source> <translation type="unfinished"></translation> </message> @@ -20457,102 +20611,102 @@ <translation>Задайте номер ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation>Задать ревизию идентификатором изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Задайте идентификатор изменений</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation>Задать ревизию с помощью метки</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation>Задать ревизию с помощью метки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="94"/> <source>Tag:</source> <translation>Метка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="107"/> <source>Enter a tag name</source> <translation>Введите имя метки</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="117"/> + <source>Select to specify a revision by a branch</source> + <translation>Задать ревизию с помощью имени ветви</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="120"/> - <source>Select to specify a revision by a branch</source> - <translation>Задать ревизию с помощью имени ветви</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="123"/> <source>Branch:</source> <translation>Ветвь:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="136"/> <source>Enter a branch name</source> <translation>Введите имя ветви</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="175"/> + <source>Select to not specify a specific revision</source> + <translation>Не задавать конкретную ревизию</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> - <source>Select to not specify a specific revision</source> - <translation>Не задавать конкретную ревизию</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="181"/> <source>No revision selected</source> - <translation>Ревизия не выбрана</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="194"/> + <translation type="obsolete">Ревизия не выбрана</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="191"/> <source>Commit data</source> <translation>Фиксировать данные</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="197"/> <source>Commit message:</source> <translation>Описание изменений:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="204"/> <source>Enter the commit message or leave empty to use the default one</source> <translation>Введите описание изменений, иначе будет использовано описание по умолчанию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="216"/> <source>Commit Date:</source> <translation>Дата подачи:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="226"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="223"/> <source>Enter optional date for the commit</source> <translation>Введите дату подачи</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="236"/> <source>Commit User:</source> <translation>Автор подачи:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="243"/> <source>Enter optional user for the commit</source> <translation>Введите автора подачи</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="255"/> + <source>Select to merge with parent of the project directory</source> + <translation>Слить с предком проекта</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="258"/> - <source>Select to merge with parent of the project directory</source> - <translation>Слить с предком проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="261"/> <source>Merge with current parent</source> <translation>Слить с текущим предком</translation> </message> @@ -20562,20 +20716,25 @@ <translation>Отмена изменений <{0}>.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="146"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="149"/> <source>Bookmark:</source> <translation type="unfinished">Закладка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished">Введите имя закладки</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBackoutDialog.ui" line="178"/> + <source>Parent</source> + <translation type="unfinished">Предок</translation> + </message> </context> <context> <name>HgBookmarkDialog</name> @@ -20620,80 +20779,85 @@ <translation>Задайте номер ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="99"/> <source>Select to specify a revision by changeset id</source> <translation>Задать ревизию идентификатором изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="105"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="102"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="112"/> <source>Enter a changeset id</source> <translation>Задайте идентификатор изменений</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="119"/> + <source>Select to specify a revision by a tag</source> + <translation>Задать ревизию с помощью метки</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="122"/> - <source>Select to specify a revision by a tag</source> - <translation>Задать ревизию с помощью метки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="125"/> <source>Tag:</source> <translation>Метка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="141"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="138"/> <source>Enter a tag name</source> <translation>Введите имя метки</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="148"/> + <source>Select to specify a revision by a branch</source> + <translation>Задать ревизию с помощью имени ветви</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="151"/> - <source>Select to specify a revision by a branch</source> - <translation>Задать ревизию с помощью имени ветви</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="154"/> <source>Branch:</source> <translation>Ветвь:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="167"/> <source>Enter a branch name</source> <translation>Введите имя ветви</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="177"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="180"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="183"/> <source>Bookmark:</source> <translation type="unfinished">Закладка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="199"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="196"/> <source>Enter a bookmark name</source> <translation type="unfinished">Введите имя закладки</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="206"/> + <source>Select tip revision of repository</source> + <translation>Головная ревизия репозитория</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> - <source>Select tip revision of repository</source> - <translation>Головная ревизия репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="212"/> <source>TIP</source> - <translation>TIP</translation> + <translation type="obsolete">TIP</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.py" line="43"/> <source>Move Bookmark</source> <translation>Вернуть закладку</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarkDialog.ui" line="209"/> + <source>Parent</source> + <translation type="unfinished">Предок</translation> + </message> </context> <context> <name>HgBookmarkRenameDialog</name> @@ -20787,27 +20951,27 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="50"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="48"/> <source>Mercurial Incoming Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="52"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="50"/> <source>Mercurial Outgoing Bookmarks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="137"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="140"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="137"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="175"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksInOutDialog.py" line="172"/> <source>no bookmarks found</source> <translation type="unfinished"></translation> </message> @@ -20897,22 +21061,50 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="119"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="119"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="157"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/BookmarksExtension/HgBookmarksListDialog.py" line="154"/> <source>no bookmarks defined</source> <translation type="unfinished"></translation> </message> </context> <context> + <name>HgBranchInputDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBranchInputDialog.ui" line="14"/> + <source>Create Branch</source> + <translation type="unfinished">Создать ветвь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBranchInputDialog.ui" line="23"/> + <source>Enter branch name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBranchInputDialog.ui" line="30"/> + <source>Enter the new branch name (spaces will be converted to _)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBranchInputDialog.ui" line="40"/> + <source>Select to commit the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBranchInputDialog.ui" line="43"/> + <source>Commit Branch</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgBundleDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="14"/> @@ -21025,11 +21217,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> - <source>Multiple</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="155"/> <source>Enter changesets by number, id, range or revset expression one per line</source> <translation type="unfinished"></translation> @@ -21044,46 +21231,56 @@ <source>Compression:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="32"/> + <source>Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgBundleDialog.ui" line="42"/> + <source>Enter revisions by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgClient</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="84"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="131"/> <source>Did not receive the 'hello' message.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="132"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="133"/> <source>Received data on unexpected channel.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="137"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="138"/> <source>Bad 'hello' message, expected 'capabilities: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="142"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="143"/> <source>'capabilities' message did not contain any capability.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="150"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="151"/> <source>Bad 'hello' message, expected 'encoding: ' but got '{0}'.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="156"/> <source>'encoding' message did not contain any encoding.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgClient.py" line="342"/> <source>For message see output dialog.</source> <translation type="unfinished"></translation> </message> @@ -21224,12 +21421,12 @@ <translation>Mercurial Copy</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="25"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="64"/> <source>Press to open a selection dialog</source> <translation>Нажмите, чтобы открыть диалог выбора</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="28"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="67"/> <source><b>Target directory</b> <p>Select the target name for the operation via a selection dialog.</p></source> <translation><b>Каталог назначенияy</b> @@ -21238,27 +21435,27 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="32"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="39"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="25"/> <source>Source:</source> <translation>Откуда:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="46"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="32"/> <source>Shows the name of the source</source> <translation>Имя источника</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="49"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="35"/> <source><b>Source name</b> <p>This field shows the name of the source.</p></source> <translation><b>Откуда</b> <p>Это поле показывает имя источника.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="60"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="46"/> <source>Enter the target name</source> <translation>Задайте имя приёмника</translation> </message> @@ -21270,32 +21467,32 @@ <p>В этом поле задайте новое мия.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="57"/> <source>Target:</source> <translation>Куда:</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="77"/> + <source>Select to force the operation</source> + <translation>Выполнить операцию принудительно</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="80"/> - <source>Select to force the operation</source> - <translation>Выполнить операцию принудительно</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="83"/> <source>Enforce operation</source> <translation>Выполнить принудительно</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="47"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="49"/> <source>Mercurial Move</source> <translation>Mercurial Move</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.py" line="87"/> <source>Select target</source> <translation>Выберите цель</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="63"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgCopyDialog.ui" line="49"/> <source><b>Target name</b> <p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> <translation type="unfinished"></translation> @@ -21359,12 +21556,12 @@ <translation>Alt+П</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="154"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="148"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDialog.py" line="154"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -21432,52 +21629,52 @@ <translation>Alt+П</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="193"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="196"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="193"/> <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/HgDiffDialog.py" line="223"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="220"/> <source>There is no difference.</source> <translation>Различий нет.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="435"/> <source>Save Diff</source> <translation>Сохранить изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="407"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="402"/> <source>Patch Files (*.diff)</source> <translation>Файлы изменений (*.diff)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="435"/> <source><p>The patch file <b>{0}</b> could not be saved.<br>Reason: {1}</p></source> <translation><p>Невозможно сохранить патч в файл <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="424"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="419"/> <source><p>The patch file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл изменений <b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="115"/> <source>Patch Contents</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="234"/> <source><Start></source> <translation type="unfinished"><Начало></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py" line="235"/> <source><End></source> <translation type="unfinished"><Конец></translation> </message> @@ -21485,7 +21682,7 @@ <context> <name>HgExportDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py" line="73"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.py" line="76"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> @@ -21495,22 +21692,22 @@ <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="85"/> + <source>Press to select the export directory via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="35"/> - <source>Press to select the export directory via a directory selection dialog</source> + <source>File Name Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="42"/> + <source>Enter the file name pattern for the export files</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="45"/> - <source>File Name Pattern:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="52"/> - <source>Enter the file name pattern for the export files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="55"/> <source><b>File Name Pattern</b> <p>Enter the file name pattern to be used to generate the export files here. Valid recognized patterns are:</p> @@ -21528,32 +21725,32 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="75"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="65"/> <source>Changesets:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="82"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="72"/> <source>Enter changesets by number, id, range or revset expression one per line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="97"/> <source>Compare Against Second Parent</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="107"/> <source>Treat all Files as Text</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="117"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="114"/> <source>Omit Dates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgExportDialog.ui" line="121"/> <source>Use Git extended Diff-Format</source> <translation type="unfinished"></translation> </message> @@ -21619,125 +21816,130 @@ <translation type="unfinished">Задайте номер ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished">Задать ревизию идентификатором изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="71"/> <source>Id:</source> <translation type="unfinished">Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation type="unfinished">Задайте идентификатор изменений</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation type="unfinished">Задать ревизию с помощью метки</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation type="unfinished">Задать ревизию с помощью метки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="94"/> <source>Tag:</source> <translation type="unfinished">Метка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="107"/> <source>Enter a tag name</source> <translation type="unfinished">Введите имя метки</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="117"/> + <source>Select to specify a revision by a branch</source> + <translation type="unfinished">Задать ревизию с помощью имени ветви</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="120"/> - <source>Select to specify a revision by a branch</source> - <translation type="unfinished">Задать ревизию с помощью имени ветви</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="123"/> <source>Branch:</source> <translation type="unfinished">Ветвь:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="136"/> <source>Enter a branch name</source> <translation type="unfinished">Введите имя ветви</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="146"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="149"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="152"/> <source>Bookmark:</source> <translation type="unfinished">Закладка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished">Введите имя закладки</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="175"/> + <source>Select tip revision of repository</source> + <translation type="unfinished">Головная ревизия репозитория</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> - <source>Select tip revision of repository</source> - <translation type="unfinished">Головная ревизия репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="181"/> <source>TIP</source> - <translation type="unfinished">TIP</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="194"/> + <translation type="obsolete">TIP</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="191"/> <source>Commit Message</source> <translation type="unfinished">Commit сообщение</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="197"/> + <source>Select to not commit the signature</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="200"/> - <source>Select to not commit the signature</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="203"/> <source>Do Not Commit</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="210"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="207"/> <source>Enter a commit message (leave empty to use default)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="225"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="222"/> <source>Key-ID:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="229"/> <source>Enter the ID of the key to be used</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="236"/> + <source>Select to make the signature local</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="239"/> - <source>Select to make the signature local</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="242"/> <source>Local Signature</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="246"/> + <source>Select to sign even if the signature file is modified</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="249"/> - <source>Select to sign even if the signature file is modified</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="252"/> <source>Force Signature</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignDialog.ui" line="178"/> + <source>Parent</source> + <translation type="unfinished">Предок</translation> + </message> </context> <context> <name>HgGpgSignaturesDialog</name> @@ -21752,7 +21954,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="312"/> <source>Revision</source> <translation type="unfinished">Версия (ревизия)</translation> </message> @@ -21827,17 +22029,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="113"/> <source>Process Generation Error</source> <translation type="unfinished">Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="116"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="113"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="151"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="148"/> <source>no signatures found</source> <translation type="unfinished"></translation> </message> @@ -22018,22 +22220,22 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="187"/> <source>Select to enforce the import</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="190"/> <source>Enforce Import</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="68"/> <source>Select patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="65"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="68"/> <source>Patch Files (*.diff *.patch);;All Files (*)</source> <translation type="unfinished"></translation> </message> @@ -22041,263 +22243,263 @@ <context> <name>HgLogBrowserDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="63"/> <source>Mercurial Log</source> <translation>Mercurial Log</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="25"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="22"/> <source>From:</source> <translation>От:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="32"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="29"/> <source>Enter the start date</source> <translation>Задайте начальную дату</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="42"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="39"/> <source>To:</source> <translation>До:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="49"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="46"/> <source>Enter the end date</source> <translation>Задайте конечную дату</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="102"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="99"/> <source>Select the field to filter on</source> <translation>Задайте поле, по которому фильтровать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1248"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1365"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1245"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1362"/> <source>Author</source> <translation>Автор</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="238"/> <source>Message</source> <translation>Сообщение</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="121"/> <source>Enter the regular expression to filter on</source> <translation>Задайте регулярное выражения для фильтра</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="180"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="177"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="230"/> <source>Action</source> <translation>Действие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="238"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="235"/> <source>Path</source> <translation>Путь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="243"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="240"/> <source>Copy from</source> <translation>Копировать из</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="250"/> + <source>Press to get the next bunch of log entries</source> + <translation>Нажмите для получения следующей части сообщений журнала</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="253"/> - <source>Press to get the next bunch of log entries</source> - <translation>Нажмите для получения следующей части сообщений журнала</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="256"/> <source>&Next</source> <translation>&Далее</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="263"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="260"/> <source>Enter the limit of entries to fetch</source> <translation>Задайте максимальное количество записей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="292"/> <source>Select to stop listing log messages at a copy or move</source> <translation>Выберите для приостановки пролистывания сообщений журнала при копировании или перемещении</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="285"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="295"/> <source>Stop on Copy/Move</source> <translation>Стоп при копировании/перемещении</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="322"/> + <source>Press to compare two revisions</source> + <translation>Нажмите, чтобы сравнить две версии</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="325"/> - <source>Press to compare two revisions</source> - <translation>Нажмите, чтобы сравнить две версии</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="328"/> <source>&Compare Revisions</source> <translation>&Сравнить версии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="403"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="386"/> <source>Errors</source> <translation>Ошибки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="409"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="392"/> <source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source> <translation><b>Ошибки</b> <p>Показаны возможные ошибки команды hg log.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="408"/> <source>Input</source> <translation>Ввод</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="447"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/> <source>Press to send the input to the hg process</source> <translation>Отправить данные процессу hg</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/> + <source>&Send</source> + <translation>&Отправить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/> + <source>Alt+S</source> + <translation>Alt+О</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="443"/> + <source>Enter data to be sent to the hg process</source> + <translation>Задайте данные, которые будут посланы процессу hg</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="450"/> - <source>&Send</source> - <translation>&Отправить</translation> + <source>Select to switch the input field to password mode</source> + <translation>Задать режим ввода пароля для поля ввода пароля</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="453"/> - <source>Alt+S</source> - <translation>Alt+О</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="460"/> - <source>Enter data to be sent to the hg process</source> - <translation>Задайте данные, которые будут посланы процессу hg</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="467"/> - <source>Select to switch the input field to password mode</source> - <translation>Задать режим ввода пароля для поля ввода пароля</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="470"/> <source>&Password Mode</source> <translation>&Парольный режим</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="473"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="456"/> <source>Alt+P</source> <translation>Alt+П</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="118"/> <source>Added</source> <translation>Добавлено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="119"/> <source>Deleted</source> <translation>Удалено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="120"/> <source>Modified</source> <translation>Изменено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="808"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="808"/> <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/HgLogBrowserDialog.ui" line="160"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="157"/> <source>Branch</source> <translation>Ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="190"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="187"/> <source>Tags</source> <translation>Метки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="518"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="576"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="521"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="579"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="582"/> <source>Mercurial Error</source> <translation>Ошибка Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="152"/> <source>Graph</source> <translation>Граф</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="302"/> + <source>Press to generate a diff to the first parent revision</source> + <translation>Создание сравнения с предыдущей версией</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="305"/> - <source>Press to generate a diff to the first parent revision</source> - <translation>Создание сравнения с предыдущей версией</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="308"/> <source>Diff to Parent &1</source> <translation>Сравнить с предком &1</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="312"/> + <source>Press to generate a diff to the second parent revision</source> + <translation>Создание сравнения с пред-предыдущей версией</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="315"/> - <source>Press to generate a diff to the second parent revision</source> - <translation>Создание сравнения с пред-предыдущей версией</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="318"/> <source>Diff to Parent &2</source> <translation>Сравнить с предком &2</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="69"/> <source>Branch:</source> <translation>Ветвь:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="79"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="76"/> <source>Select the branch to filter on</source> <translation>Задайте ветвь, по которой фильтровать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/> <source>All</source> <translation>Все</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="61"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="65"/> <source>Mercurial Log (Incoming)</source> <translation>лог (входящий)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="63"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="67"/> <source>Mercurial Log (Outgoing)</source> <translation>лог (исходящий)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="129"/> <source>Bookmarks</source> <translation type="unfinished">Закладки</translation> </message> @@ -22307,61 +22509,101 @@ <translation type="obsolete">Обновить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="77"/> <source>Press to refresh the list of changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/> <source>&Refresh</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="170"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="167"/> <source>Phase</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="146"/> + <source>Change the phase of the selected revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="148"/> + <source><b>Change Phase</b> +<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="144"/> + <source>Change Phase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1524"/> + <source>Copy Changesets</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1561"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Необходимо перезагрузить проект. Сделать это?</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="358"/> - <source>Change the phase of the selected revisions</source> + <source>Select to show differences side-by-side</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="361"/> - <source><b>Change Phase</b> -<p>This changes the phase of the selected revisions. The selected revisions have to have the same current phase.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="365"/> - <source>Change Phase</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="348"/> - <source>Press to copy the selected changesets to the current branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1402"/> - <source>Copy Changesets</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1402"/> - <source>The project should be reread. Do this now?</source> - <translation type="unfinished">Необходимо перезагрузить проект. Сделать это?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="385"/> - <source>Select to show differences side-by-side</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="388"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="368"/> + <source>Select action from menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="138"/> + <source>Copy the selected changesets to the current branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="155"/> + <source>Tag</source> + <translation type="unfinished">Метка</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="157"/> + <source>Tag the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1561"/> + <source>Switch</source> + <translation type="unfinished">Переключиться</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/> + <source>Switch the working directory to the selected revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/> + <source>Pull Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/> + <source>Pull large files for selected revisions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="898"/> + <source>{0} (large file)</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgLogDialog</name> @@ -22431,121 +22673,121 @@ <translation>Alt+П</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="57"/> <source><b>Processing your request, please wait...</b></source> <translation><b>Запрос обрабатывается, пожалуйста, ждите...</b></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="68"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="67"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="214"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="191"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="214"/> <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/HgLogDialog.py" line="283"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="305"/> <source>No log available for '{0}'</source> <translation>Отсутствует журнальная записть для '{0}'</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="317"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="339"/> <source>diff to {0}</source> <translation>Сравнить с {0}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="329"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="351"/> <source>Branches: {0}<br /> </source> <translation>Ветви: {0}<br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="354"/> <source>Tags: {0}<br /> </source> <translation>Метки: {0}<br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="338"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="360"/> <source>Parents: {0}<br /> </source> <translation>Предки: {0}<br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="363"/> <source><i>Author: {0}</i><br /> </source> <translation><i>Автор: {0}</i><br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="345"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="367"/> <source><i>Date: {0}, {1}</i><br /> </source> <translation><i>Дата: {0}, {1}</i><br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="361"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="383"/> <source>Added {0}<br /> </source> <translation>Добавлено: {0}<br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="367"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="389"/> <source>Modified {0}<br /> </source> <translation>Изменено {0}<br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="373"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="395"/> <source>Deleted {0}<br /> </source> <translation>Удалено {0}<br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="269"/> <source>The hg process did not finish within 30s.</source> <translation>Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="272"/> <source>Could not start the hg executable.</source> <translation>Невозможно запустить исполняемый файл hg.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="275"/> <source>Mercurial Error</source> <translation>Ошибка Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="356"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="378"/> <source>Added {0} (copied from {1})<br /> </source> <translation>Добавлено {0} (скопировано из {1})<br /> </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="335"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="357"/> <source>Bookmarks: {0}<br /> </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="326"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py" line="348"/> <source>Phase: {0}<br /> </source> <translation type="unfinished"></translation> @@ -22589,82 +22831,82 @@ <translation>Задайте номер ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation>Задать ревизию идентификатором изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Задайте идентификатор изменений</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation>Задать ревизию с помощью метки</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation>Задать ревизию с помощью метки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="94"/> <source>Tag:</source> <translation>Метка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="101"/> <source>Enter a tag name</source> <translation>Введите имя метки</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="163"/> + <source>Select to not specify a specific revision</source> + <translation>Не задавать конкретную ревизию</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="166"/> - <source>Select to not specify a specific revision</source> - <translation>Не задавать конкретную ревизию</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="169"/> <source>No revision selected</source> <translation>Ревизия не выбрана</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="179"/> + <source>Select to force the merge operation</source> + <translation>Выполнить операцию слияния принудительно</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="182"/> - <source>Select to force the merge operation</source> - <translation>Выполнить операцию слияния принудительно</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="185"/> <source>Enforce merge</source> <translation>Слить принудительно</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="111"/> + <source>Select to specify a revision by a branch</source> + <translation>Задать ревизию с помощью имени ветви</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="114"/> - <source>Select to specify a revision by a branch</source> - <translation>Задать ревизию с помощью имени ветви</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="117"/> <source>Branch:</source> <translation>Ветвь:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="124"/> <source>Enter a branch name</source> <translation>Введите имя ветви</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="134"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="137"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="140"/> <source>Bookmark:</source> <translation>Закладка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="156"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMergeDialog.ui" line="153"/> <source>Enter a bookmark name</source> <translation>Введите имя закладки</translation> </message> @@ -22687,16 +22929,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="32"/> - <source>Changesets:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="42"/> - <source>Enter changesets by number, id, range or revset expression one per line</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="55"/> <source>Select to specify a revision by a tag</source> <translation>Задать ревизию с помощью метки</translation> @@ -22751,6 +22983,16 @@ <source>Enter number of entries to show:</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="32"/> + <source>Revisions:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgMultiRevisionSelectionDialog.ui" line="42"/> + <source>Enter revisions by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgNewProjectOptionsDialog</name> @@ -22769,47 +23011,47 @@ <p>Для удалённых репозиториев URL должен содержать имя сервера.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="30"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="28"/> <source>&Protocol:</source> <translation>&Протокол:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="40"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="38"/> <source>Select the protocol to access the repository</source> <translation>Задайте протокол доступа к репозиторию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="47"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="45"/> <source>&URL:</source> <translation>&URL:</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="116"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="74"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="69"/> <source>&Revision:</source> <translation>&Ревизия:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="79"/> <source>Enter the revision the new project should be generated from</source> <translation>Задайте ревизию, из которой будет собран проект</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="89"/> <source>Project &Directory:</source> <translation>&Каталог проекта:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="99"/> <source>Enter the directory of the new project.</source> <translation>Задайте каталог нового проекта.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="107"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="102"/> <source><b>Project Directory</b> <p>Enter the directory of the new project. It will be retrieved from the repository and be placed in this directory.</p></source> @@ -22817,17 +23059,17 @@ <p>Задайте каталог проекта. Он будет получен из репозитория и помещён в этот каталог.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="67"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="96"/> <source>Select Repository-Directory</source> <translation>Задайте каталог репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="82"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.py" line="111"/> <source>Select Project Directory</source> <translation>Выберите каталог проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="64"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="62"/> <source>Select the repository url via a directory selection dialog</source> <translation>Выберите каталог с помощью диалога</translation> </message> @@ -22837,10 +23079,20 @@ <translation type="obsolete">Задайте URL репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="55"/> <source>Enter the url path of the repository (without protocol part)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="114"/> + <source>Download all versions of all large files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgNewProjectOptionsDialog.ui" line="121"/> + <source><b>Note:</b> This option increases the download time and volume.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgOptionsDialog</name> @@ -22894,11 +23146,6 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="33"/> - <source>Enter changesets by number, id, range or revset expression one per line</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="46"/> <source>Phase:</source> <translation type="unfinished"></translation> @@ -22933,26 +23180,31 @@ <source>Secret</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgPhaseDialog.ui" line="33"/> + <source>Enter revisions by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectBrowserHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="498"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="586"/> <source>Version Control</source> <translation>Контроль версий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="598"/> <source>Commit changes to repository...</source> <translation>Зафиксировать изменения в репозитории...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="516"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="605"/> <source>Add to repository</source> <translation>Добавить в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="520"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="609"/> <source>Remove from repository (and disk)</source> <translation>Удаление из репозитория (и с диска)</translation> </message> @@ -22967,7 +23219,7 @@ <translation type="obsolete">Переместить в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="528"/> <source>Show log</source> <translation>Показать журнал</translation> </message> @@ -22977,17 +23229,17 @@ <translation type="obsolete">Показать ограниченный журнал</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="532"/> <source>Show log browser</source> <translation>Показать проводник журналов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="531"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="620"/> <source>Show difference</source> <translation>Показать различие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="535"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="624"/> <source>Show difference (extended)</source> <translation>Показать различие (расширенно)</translation> </message> @@ -22997,42 +23249,42 @@ <translation type="obsolete">Разрешить конфликт</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="549"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="638"/> <source>Select all local file entries</source> <translation>Выделить все локальные файлы</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="640"/> <source>Select all versioned file entries</source> <translation>Выделить все файлы с версиями (VCS)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="553"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="642"/> <source>Select all local directory entries</source> <translation>Выделить все локальные каталоги</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="555"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="644"/> <source>Select all versioned directory entries</source> <translation>Выделить все каталоги с версиями (VCS)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="526"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="615"/> <source>Show status</source> <translation>Показать статус</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="256"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="342"/> <source>Show annotated file</source> <translation>Показать файл, снабжённый комментариями</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="541"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="630"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="703"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="778"/> <source>Remove from repository only</source> <translation>Удалить только из репозитория</translation> </message> @@ -23042,175 +23294,180 @@ <translation type="obsolete">Вы правда хотите удалить эти файлы переводов и из репозитория?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="703"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="778"/> <source>Do you really want to remove these files from the repository?</source> <translation>Вы правда хотите удалить эти файлы переводов и из репозитория?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="545"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="634"/> <source>Conflict resolved</source> <translation>Конфликт решён</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="523"/> <source>Copy</source> <translation>Копировать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="437"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="525"/> <source>Move</source> <translation>Сдвинуть</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="328"/> <source>Show difference side-by-side</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="251"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="337"/> <source>Show difference side-by-side (extended)</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py" line="244"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgProjectHelper</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="105"/> <source>New from repository</source> <translation>Новый из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="105"/> <source>&New from repository...</source> <translation>&Новый из репозитория...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="110"/> <source>Create (clone) a new project from a Mercurial repository</source> <translation>Создание копии репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="107"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="113"/> <source><b>New from repository</b><p>This creates (clones) a new local project from a Mercurial repository.</p></source> <translation><b>Новый из репозитория</b><p>Создать (скопировать) новый проект из репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="115"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="121"/> <source>Show incoming log</source> <translation>Показать журнал входящих изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="126"/> <source>Show the log of incoming changes</source> <translation>Показать журнал входящих изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="129"/> <source><b>Show incoming log</b><p>This shows the log of changes coming into the repository.</p></source> <translation><b>Показать журнал изменений</b><p>Показать журнал входящих в репозиторий изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="137"/> <source>Pull changes</source> <translation>Загрузить изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="142"/> <source>Pull changes from a remote repository</source> <translation>Загрузка изменений из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="145"/> <source><b>Pull changes</b><p>This pulls changes from a remote repository into the local repository.</p></source> <translation><b>Загрузить изменения</b><p>Обновить локальный проект из удалённого репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="153"/> <source>Update from repository</source> <translation>Обновить из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="147"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="153"/> <source>&Update from repository</source> <translation>&Обновить из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="158"/> <source>Update the local project from the Mercurial repository</source> <translation>Обновить локальный проект из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="161"/> <source><b>Update from repository</b><p>This updates the local project from the Mercurial repository.</p></source> <translation><b>Обновить из репозитория</b><p>Обновить локальный проект из репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="169"/> <source>Commit changes to repository</source> <translation>Сохранение изменения в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="163"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="169"/> <source>&Commit changes to repository...</source> <translation>&Сохранение изменения в репозиторий...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="174"/> <source>Commit changes to the local project to the Mercurial repository</source> <translation>Сохранить изменения локального проекта в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="171"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="177"/> <source><b>Commit changes to repository</b><p>This commits changes to the local project to the Mercurial repository.</p></source> <translation><b>Сохранение изменения в репозиторий</b><p>Сохранить изменения локального проекта в репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="179"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="185"/> <source>Show outgoing log</source> <translation>Показать журнал выходящих изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="184"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="190"/> <source>Show the log of outgoing changes</source> <translation>Показать журнал выходящих изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="187"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="193"/> <source><b>Show outgoing log</b><p>This shows the log of changes outgoing out of the repository.</p></source> <translation><b>Показать журнал изменений</b><p>Показать журнал выходящих из репозитория изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="195"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="201"/> <source>Push changes</source> <translation>Послать изменения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="200"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="206"/> <source>Push changes to a remote repository</source> <translation>Послать изменения в удалённый репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="203"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="209"/> <source><b>Push changes</b><p>This pushes changes from the local repository to a remote repository.</p></source> <translation><b>Послать изменения</b><p>Послать изменения из локального проекта в удалённый репозиторий.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="233"/> <source>Export from repository</source> <translation>Экспорт из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="227"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="233"/> <source>&Export from repository...</source> <translation>&Экспорт из репозитория...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="232"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="238"/> <source>Export a project from the repository</source> <translation>Экспортировать проект из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="235"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="241"/> <source><b>Export from repository</b><p>This exports a project from the repository.</p></source> <translation><b>Экспорт из репозитория</b><p>Экспортировать проект из репозитория.</p></translation> </message> @@ -23255,22 +23512,22 @@ <translation type="obsolete"><b>Удалить из репозитория</b><p>Удалить локальный проект из репозитория. Локальная копия (на диске) также будет удалена.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>Show log</source> <translation>Показать журнал</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="248"/> <source>Show &log</source> <translation>Показать &журнал</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="247"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="253"/> <source>Show the log of the local project</source> <translation>Показать журнал изменений локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="250"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="256"/> <source><b>Show log</b><p>This shows the log of the local project.</p></source> <translation><b>Показать журнал</b><p>Показать журнал изменений локального проекта.</p></translation> </message> @@ -23290,117 +23547,117 @@ <translation type="obsolete"><b>Показать ограниченный журнал</b><p>Отображает журнал с заданным количеством элементов.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="257"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="263"/> <source>Show log browser</source> <translation>Показать проводник журналов</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="262"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="268"/> <source>Show a dialog to browse the log of the local project</source> <translation>Показать диалог для навигации по файлу журнала для локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="265"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="271"/> <source><b>Show log browser</b><p>This shows a dialog to browse the log of the local project. A limited number of entries is shown first. More can be retrieved later on.</p></source> <translation><b>Показать проводник журнала</b><p>Показывает диалог для навигации по файлу журнала локального проекта. Изначально показывается ограниченное количество записей. Дальнейшие записи могут быть получены позже.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show difference</source> <translation>Показать различие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="280"/> <source>Show &difference</source> <translation>Показать &различие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="285"/> <source>Show the difference of the local project to the repository</source> <translation>Показать изменения между репозиторием и локальной копией</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="282"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="288"/> <source><b>Show difference</b><p>This shows the difference of the local project to the repository.</p></source> <translation><b>Показать различие</b><p>Показать различие между локальным проектом и репозиторием.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="290"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="296"/> <source>Show difference (extended)</source> <translation>Показать различие (расширенно)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="301"/> <source>Show the difference of revisions of the project to the repository</source> <translation>Показать разницу версий между репозиторием и локальной копией</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="298"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="304"/> <source><b>Show difference (extended)</b><p>This shows the difference of selectable revisions of the project.</p></source> <translation><b>Показать разницу (насширенно)</b><p>Отображает различие выбираемых ревизий проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="343"/> <source>Show heads</source> <translation>Показать текущие версии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="347"/> <source>Show the heads of the repository</source> <translation>Показать текущие версии в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="350"/> <source><b>Show heads</b><p>This shows the heads of the repository.</p></source> <translation><b>Показать текущие версии</b><p>Показать текущие версии в репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="351"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="357"/> <source>Show parents</source> <translation>Показать предков</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="355"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="361"/> <source>Show the parents of the repository</source> <translation>Показать предков репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="358"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="364"/> <source><b>Show parents</b><p>This shows the parents of the repository.</p></source> <translation><b>Показать предков</b><p>Показать предков репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="365"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="371"/> <source>Show tip</source> <translation>Показать tip</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="375"/> <source>Show the tip of the repository</source> <translation>Показать tip репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="378"/> <source><b>Show tip</b><p>This shows the tip of the repository.</p></source> <translation><b>Показать tip</b><p>Показать tip репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="394"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Merge</source> <translation>Слить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="394"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="400"/> <source>Mer&ge changes...</source> <translation>С&лить изменения...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="405"/> <source>Merge changes of a revision into the local project</source> <translation>Слить изменения из ревизии с локальным проектом</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="408"/> <source><b>Merge</b><p>This merges changes of a revision into the local project.</p></source> <translation><b>Слить</b><p>Слить изменения из ревизии с локальным проектом.</p></translation> </message> @@ -23425,7 +23682,7 @@ <translation type="obsolete"><b>Разрешить конфликты</b><p>Разрешить все конфликты в локальном проекте.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> <source>Show status</source> <translation>Показать статус</translation> </message> @@ -23435,227 +23692,227 @@ <translation type="obsolete">Показать &статус</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="311"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="317"/> <source>Show the status of the local project</source> <translation>Показать статус локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="320"/> <source><b>Show status</b><p>This shows the status of the local project.</p></source> <translation><b>Показать статус</b><p>Показать статус локального проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="385"/> <source>Re&vert changes</source> <translation>От&мена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="390"/> <source>Revert all changes made to the local project</source> <translation>Отменить все изменения в локальном проекте</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="387"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="393"/> <source><b>Revert changes</b><p>This reverts all changes made to the local project.</p></source> <translation><b>Отмена изменений</b><p>Все изменения в локальном проекте будут отменены.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>Tag in repository</source> <translation>Создать метку в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="431"/> <source>&Tag in repository...</source> <translation>Создать &метку в репозитории...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="436"/> <source>Tag the local project in the repository</source> <translation>Создать в репозитории метку для проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="439"/> <source><b>Tag in repository</b><p>This tags the local project in the repository.</p></source> <translation><b>Создать метку</b><p>Создаёт метку для локального проекта в репозитории.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>List tags</source> <translation>Список меток</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="440"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="446"/> <source>List tags...</source> <translation>Список меток...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="444"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="450"/> <source>List tags of the project</source> <translation>Список меток текущего проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="447"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="453"/> <source><b>List tags</b><p>This lists the tags of the project.</p></source> <translation><b>Список меток</b><p>Отображает список меток текущего проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> <source>List branches</source> <translation>Список ветвей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="454"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="460"/> <source>List branches...</source> <translation>Список ветвей...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="458"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="464"/> <source>List branches of the project</source> <translation>Список ветвей текущего проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="461"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="467"/> <source><b>List branches</b><p>This lists the branches of the project.</p></source> <translation><b>Список ветвей</b><p>Отображает список ветвей текущего проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> <source>Create branch</source> <translation>Создать ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="468"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="474"/> <source>Create &branch...</source> <translation>Создать &ветвь...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="473"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="479"/> <source>Create a new branch for the local project in the repository</source> <translation>Создать новую ветвь в репозитории для локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="476"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="482"/> <source><b>Create branch</b><p>This creates a new branch for the local project in the repository.</p></source> <translation><b>Создать ветвь</b><p>Создать новую ветвь в репозитории для локального проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="500"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="506"/> <source>Close branch</source> <translation>Закрыть ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="504"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="510"/> <source>Close the current branch of the local project</source> <translation>Закрыть ветвь локального проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="507"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="513"/> <source><b>Close branch</b><p>This closes the current branch of the local project.</p></source> <translation><b>Закрыть ветвь</b><p>Закрыть ветвь в репозитории для локального проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> <source>Switch</source> <translation>Переключиться</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="528"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="534"/> <source>S&witch...</source> <translation>Пе&реключиться...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="533"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="539"/> <source>Switch the working directory to another revision</source> <translation>Переключить рабочий каталог на другую ревизию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="536"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="542"/> <source><b>Switch</b><p>This switches the working directory to another revision.</p></source> <translation><b>Переключить</b><p>Переключить рабочий каталог на другую ревизию.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Cleanup</source> <translation>Очистка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="544"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="550"/> <source>Cleanu&p</source> <translation>О&чистка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="548"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="554"/> <source>Cleanup the local project</source> <translation>Очистить локальный проект</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="551"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="557"/> <source><b>Cleanup</b><p>This performs a cleanup of the local project.</p></source> <translation><b>Очистка</b><p>Очистить локальный проект.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> <source>Execute command</source> <translation>Выполнить команду</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="558"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="564"/> <source>E&xecute command...</source> <translation>В&ыполнить команду...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="562"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="568"/> <source>Execute an arbitrary Mercurial command</source> <translation>Выполнить произвольную команду Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="565"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="571"/> <source><b>Execute command</b><p>This opens a dialog to enter an arbitrary Mercurial command.</p></source> <translation><b>Выполнить команду</b><p>Открыть диалог для ввода произвольной команды Mercurial.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="573"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/> <source>Command options</source> - <translation>Опции командной строки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="573"/> + <translation type="obsolete">Опции командной строки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="575"/> <source>Command &options...</source> - <translation>&Опции командной строки...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="577"/> - <source>Show the Mercurial command options</source> - <translation>Показать опции командной строки Mercurial</translation> + <translation type="obsolete">&Опции командной строки...</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> + <source>Show the Mercurial command options</source> + <translation type="obsolete">Показать опции командной строки Mercurial</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="581"/> <source><b>Command options...</b><p>This shows a dialog to edit the Mercurial command options.</p></source> - <translation><b>Опции командной строки...</b><p>Показать диалог для редактирования опций командной строки Mercurial.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <translation type="obsolete"><b>Опции командной строки...</b><p>Показать диалог для редактирования опций командной строки Mercurial.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> <source>Configure</source> <translation>Настроить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="587"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="579"/> <source>Configure...</source> <translation>Настроить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="591"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="583"/> <source>Show the configuration dialog with the Mercurial page selected</source> <translation>Показать диалог настроек с выбранной страницей настроек Mercurial</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="586"/> <source><b>Configure</b><p>Show the configuration dialog with the Mercurial page selected.</p></source> <translation><b>Настроить</b><p>Показать диалог настроек с выбранной страницей настроек Mercurial.</p></translation> </message> @@ -23700,177 +23957,177 @@ <translation type="obsolete"><b>Показ комбинированных настроек</b><p>Показ комбинированных настроек из всех конфигурационных файлов.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> <source>Show paths</source> <translation>Показать пути</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="647"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> <source>Show paths...</source> <translation>Показать пути...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="651"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="643"/> <source>Show the aliases for remote repositories</source> <translation>Алиасы для удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="646"/> <source><b>Show paths</b><p>This shows the aliases for remote repositories.</p></source> <translation><b>Показать пути</b><p>Показать алиасы для удалённых репозиториев.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Verify repository</source> <translation>Проверить репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="661"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="653"/> <source>Verify repository...</source> <translation>Проверить репозиторий...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="665"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="657"/> <source>Verify the integrity of the repository</source> <translation>Проверить целостность репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="668"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="660"/> <source><b>Verify repository</b><p>This verifies the integrity of the repository.</p></source> <translation><b>Проверить целостность репозитория</b><p>Проверить целостность репозитория.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Recover</source> <translation>Восстановить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="675"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="667"/> <source>Recover...</source> <translation>Восстановить...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="679"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="671"/> <source>Recover from an interrupted transaction</source> <translation>Восстановить после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="682"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="674"/> <source><b>Recover</b><p>This recovers from an interrupted transaction.</p></source> <translation><b>Восстановить</b><p>Восстановить после прерванной транзакции.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1020"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1008"/> <source>Repository Administration</source> - <translation>Администрирование репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="703"/> + <translation type="obsolete">Администрирование репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="695"/> <source>Create .hgignore</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="707"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="699"/> <source>Create a .hgignore file with default values</source> <translation>Создать файл .hgignore со значениями по умолчанию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="710"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="702"/> <source><b>Create .hgignore</b><p>This creates a .hgignore file with default values.</p></source> <translation><b>Создать файл .hgignore</b><p>Создать файл .hgignore со значениями по умолчанию.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="717"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="709"/> <source>Create changegroup...</source> <translation>Создать группу изменений...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="721"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="713"/> <source>Create changegroup file collecting changesets</source> <translation>Создать файл коллекции изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1401"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1385"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="762"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> <source>Apply changegroups...</source> <translation>Применить группу изменений...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="766"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> <source>Apply one or several changegroup files</source> <translation>Применить файл(ы) группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1052"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1041"/> <source>Changegroup Management</source> <translation>Менеджмент группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="716"/> <source><b>Create changegroup</b><p>This creates a changegroup file collecting selected changesets (hg bundle).</p></source> <translation><b>Создать группу изменений</b><p>Создать группу изменений собрав выбранные изменения (hg bundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="769"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> <source><b>Apply changegroups</b><p>This applies one or several changegroup files generated by the 'Create changegroup' action (hg unbundle).</p></source> <translation><b>Применить группы изменений</b><p>Применить одну или несколько групп изменений созданную командой 'Создать группу изменений' (hg unbundle).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="514"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="520"/> <source>Show current branch</source> <translation>Показать текущую ветвь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="518"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="524"/> <source>Show the current branch of the project</source> <translation>Показать текущую ветвь проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="521"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="527"/> <source><b>Show current branch</b><p>This shows the current branch of the project.</p></source> <translation><b>Показать текущую ветвь</b><p>Показать текущую ветвь проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> <source>Mark as "good"</source> <translation>Пометить как "хороший"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="758"/> <source>Mark a selectable changeset as good</source> <translation>Пометить выбранные изменения как "хорошие"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="784"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="761"/> <source><b>Mark as good</b><p>This marks a selectable changeset as good.</p></source> <translation><b>Пометить как "хорошие"</b><p>Пометить выбранные изменения как "хорошие".</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> <source>Mark as "bad"</source> <translation>Пометить как "плохой"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="795"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="772"/> <source>Mark a selectable changeset as bad</source> <translation>Пометить выбранные изменения как "плохие"</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="798"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="775"/> <source><b>Mark as bad</b><p>This marks a selectable changeset as bad.</p></source> <translation><b>Пометить как "плохие"</b><p>Пометить выбранные изменения как "плохие".</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> <source>Skip</source> <translation>Пропустить</translation> </message> @@ -23885,490 +24142,495 @@ <translation type="obsolete"><b>Пропустить</b><p>Пропустить текущие изменения.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="796"/> <source>Reset</source> <translation>Сбросить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="823"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="800"/> <source>Reset the bisect search data</source> <translation>Сбросить данные двоичного поиска</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="826"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="803"/> <source><b>Reset</b><p>This resets the bisect search data.</p></source> <translation><b>Сбросить</b><p>Сбросить данные двоичного поиска.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1066"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1054"/> <source>Bisect</source> <translation>Двоичный поиск</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="777"/> - <source>Mark as "good"...</source> - <translation>Пометить как "хороший"...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="791"/> - <source>Mark as "bad"...</source> - <translation>Пометить как "плохой"...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> - <source>Preview changegroup</source> - <translation>Предпросмотр группы изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="732"/> - <source>Preview changegroup...</source> - <translation>Предпросмотр группы изменений...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> - <source>Identify</source> - <translation>Идентифицировать</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="689"/> - <source>Identify...</source> - <translation>Идентифицировать...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="693"/> - <source>Identify the project directory</source> - <translation>Задайте каталог проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="696"/> - <source><b>Identify</b><p>This identifies the project directory.</p></source> - <translation><b>Каталог проекта</b><p>Задайте каталог проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="736"/> - <source>Preview a changegroup file containing a collection of changesets</source> - <translation>Предпросмотр файла содержащего коллекцию групп изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> - <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> - <translation><b>Предпросмотр групп изменений</b><p>Предпросмотр файла содержащего коллекцию групп изменений.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> - <source>Identify changegroup</source> - <translation>Выбрать группу изменений</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="747"/> - <source>Identify changegroup...</source> - <translation>Выбрать группу изменений...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="751"/> - <source>Identify a changegroup file containing a collection of changesets</source> - <translation>Выбрать файл содержащий коллекцию групп изменений</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="754"/> + <source>Mark as "good"...</source> + <translation>Пометить как "хороший"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="768"/> + <source>Mark as "bad"...</source> + <translation>Пометить как "плохой"...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <source>Preview changegroup</source> + <translation>Предпросмотр группы изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="724"/> + <source>Preview changegroup...</source> + <translation>Предпросмотр группы изменений...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <source>Identify</source> + <translation>Идентифицировать</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="681"/> + <source>Identify...</source> + <translation>Идентифицировать...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="685"/> + <source>Identify the project directory</source> + <translation>Задайте каталог проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="688"/> + <source><b>Identify</b><p>This identifies the project directory.</p></source> + <translation><b>Каталог проекта</b><p>Задайте каталог проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="728"/> + <source>Preview a changegroup file containing a collection of changesets</source> + <translation>Предпросмотр файла содержащего коллекцию групп изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="731"/> + <source><b>Preview changegroup</b><p>This previews a changegroup file containing a collection of changesets.</p></source> + <translation><b>Предпросмотр групп изменений</b><p>Предпросмотр файла содержащего коллекцию групп изменений.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <source>Identify changegroup</source> + <translation type="obsolete">Выбрать группу изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="739"/> + <source>Identify changegroup...</source> + <translation type="obsolete">Выбрать группу изменений...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="743"/> + <source>Identify a changegroup file containing a collection of changesets</source> + <translation type="obsolete">Выбрать файл содержащий коллекцию групп изменений</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="746"/> <source><b>Identify changegroup</b><p>This identifies a changegroup file containing a collection of changesets.</p></source> - <translation><b>Выбрать изменения</b><p>Выбрать файл содержащий коллекцию групп изменений.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="833"/> + <translation type="obsolete"><b>Выбрать изменения</b><p>Выбрать файл содержащий коллекцию групп изменений.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="810"/> <source>Back out changeset</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="837"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="814"/> <source>Back out changes of an earlier changeset</source> <translation>Отмена предыдущих изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="840"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="817"/> <source><b>Back out changeset</b><p>This backs out changes of an earlier changeset.</p></source> <translation><b>Отмена изменений</b><p>Отмена предыдущих изменений.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="211"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="217"/> <source>Push changes (force)</source> <translation>Послать изменения (принудительно)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="222"/> <source>Push changes to a remote repository with force option</source> <translation>Послать изменения в удалённый репозиторий (принудительно)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="225"/> <source><b>Push changes (force)</b><p>This pushes changes from the local repository to a remote repository using the 'force' option.</p></source> <translation><b>Послать изменения (принудительно)</b><p>Послать изменения в удалённый репозиторий (принудительно).</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1032"/> <source>Specials</source> <translation>Специфический</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> - <source>Serve project repository</source> - <translation>Запустить сервер для репозитория проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="874"/> - <source>Serve project repository...</source> - <translation>Запустить сервер для репозитория проекта...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="878"/> - <source>Serve the project repository</source> - <translation>Запустить сервер для репозитория проекта</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="881"/> - <source><b>Serve project repository</b><p>This serves the project repository.</p></source> - <translation><b>Запустить сервер для репозитория проекта</b><p>Запустить сервер для репозитория проекта.</p></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1238"/> - <source>Pull</source> - <translation>Загрузить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1512"/> - <source>The project should be reread. Do this now?</source> - <translation>Необходимо перезагрузить проект. Сделать это?</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="484"/> - <source>Push new branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="488"/> - <source>Push the current branch of the local project as a new named branch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="492"/> - <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="847"/> - <source>Rollback last transaction</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> + <source>Serve project repository</source> + <translation>Запустить сервер для репозитория проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="851"/> + <source>Serve project repository...</source> + <translation>Запустить сервер для репозитория проекта...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="855"/> + <source>Serve the project repository</source> + <translation>Запустить сервер для репозитория проекта</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="858"/> + <source><b>Serve project repository</b><p>This serves the project repository.</p></source> + <translation><b>Запустить сервер для репозитория проекта</b><p>Запустить сервер для репозитория проекта.</p></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1228"/> + <source>Pull</source> + <translation>Загрузить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1496"/> + <source>The project should be reread. Do this now?</source> + <translation>Необходимо перезагрузить проект. Сделать это?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="490"/> + <source>Push new branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="494"/> + <source>Push the current branch of the local project as a new named branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="498"/> + <source><b>Push new branch</b><p>This pushes the current branch of the local project as a new named branch.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="824"/> + <source>Rollback last transaction</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="828"/> <source>Rollback the last transaction</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1062"/> <source>Extensions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> <source>Edit user configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="602"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="594"/> <source>Edit user configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="606"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="598"/> <source>Show an editor to edit the user configuration file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="609"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="601"/> <source><b>Edit user configuration</b><p>Show an editor to edit the user configuration file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> <source>Edit repository configuration</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="616"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="608"/> <source>Edit repository configuration...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="620"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="612"/> <source>Show an editor to edit the repository configuration file</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="615"/> + <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> - <source><b>Edit repository configuration</b><p>Show an editor to edit the repository configuration file.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> <source>Show combined configuration settings</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="623"/> + <source>Show combined configuration settings...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="627"/> + <source>Show the combined configuration settings from all configuration files</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="631"/> - <source>Show combined configuration settings...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="635"/> - <source>Show the combined configuration settings from all configuration files</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="639"/> <source><b>Show combined configuration settings</b><p>This shows the combined configuration settings from all configuration files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="805"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="782"/> <source>Skip...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="809"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="786"/> <source>Skip a selectable changeset</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="812"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="789"/> <source><b>Skip</b><p>This skips a selectable changeset.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1457"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1441"/> <source>Import Patch</source> <translation type="unfinished">Импортировать патч</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="888"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="865"/> <source>Import Patch...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="892"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="869"/> <source>Import a patch from a patch file</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="895"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="872"/> <source><b>Import Patch</b><p>This imports a patch from a patch file into the project.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1060"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1048"/> <source>Patch Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1477"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1461"/> <source>Revert Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> <source>Export Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="903"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="880"/> <source>Export Patches...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="907"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="884"/> <source>Export revisions to patch files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="910"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="887"/> <source><b>Export Patches</b><p>This exports revisions of the project to patch files.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="917"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894"/> <source>Change Phase</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="917"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="894"/> <source>Change Phase...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="921"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="898"/> <source>Change the phase of revisions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="924"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="901"/> <source><b>Change Phase</b><p>This changes the phase of revisions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1481"/> <source>Copy Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="936"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="913"/> <source>Copies changesets from another branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="939"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="916"/> <source><b>Copy Changesets</b><p>This copies changesets from another branch on top of the current working directory with the user, date and description of the original changeset.</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="925"/> + <source>Continue Copying Session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="929"/> + <source>Continue the last copying session after conflicts were resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="932"/> + <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1074"/> + <source>Graft</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1496"/> + <source>Copy Changesets (Continue)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> + <source>Conflicts resolved</source> + <translation type="unfinished">Конфликт решён</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="416"/> + <source>Con&flicts resolved</source> + <translation type="unfinished">Кон&фликт решён</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="420"/> + <source>Mark all conflicts of the local project as resolved</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="423"/> + <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940"/> + <source>Add</source> + <translation>Добавить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="940"/> + <source>Add...</source> + <translation>Добавить...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="945"/> + <source>Add a sub-repository</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="948"/> - <source>Continue Copying Session</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="952"/> - <source>Continue the last copying session after conflicts were resolved</source> + <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> - <source><b>Continue Copying Session</b><p>This continues the last copying session after conflicts were resolved.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1086"/> - <source>Graft</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1512"/> - <source>Copy Changesets (Continue)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/> - <source>Conflicts resolved</source> - <translation type="unfinished">Конфликт решён</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="410"/> - <source>Con&flicts resolved</source> - <translation type="unfinished">Кон&фликт решён</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="414"/> - <source>Mark all conflicts of the local project as resolved</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="417"/> - <source><b>Conflicts resolved</b><p>This marks all conflicts of the local project as resolved.</p></source> + <source>Remove</source> + <translation>Удалить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="955"/> + <source>Remove...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="960"/> + <source>Remove sub-repositories</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> - <source>Add</source> - <translation>Добавить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="963"/> - <source>Add...</source> - <translation>Добавить...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="968"/> - <source>Add a sub-repository</source> + <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1083"/> + <source>Sub-Repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="312"/> + <source>Show &status...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <source>Show Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="327"/> + <source>Show summary...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="332"/> + <source>Show summary information of the working directory status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="335"/> + <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> - <source><b>Add...</b><p>Add a sub-repository to the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> - <source>Remove</source> - <translation>Удалить</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="978"/> - <source>Remove...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="983"/> - <source>Remove sub-repositories</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="986"/> - <source><b>Remove...</b><p>Remove sub-repositories from the project.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1095"/> - <source>Sub-Repository</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="306"/> - <source>Show &status...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="321"/> - <source>Show Summary</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="321"/> - <source>Show summary...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="326"/> - <source>Show summary information of the working directory status</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="329"/> - <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> <source>Create unversioned archive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="994"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="971"/> <source>Create unversioned archive...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="999"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="976"/> <source>Create an unversioned archive from the repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1002"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="979"/> <source><b>Create unversioned archive...</b><p>This creates an unversioned archive from the repository.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="854"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="831"/> <source><b>Rollback last transaction</b><p>This performs a rollback of the last transaction. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. For example, the following commands are transactional, and their effects can be rolled back:<ul><li>commit</li><li>import</li><li>pull</li><li>push (with this repository as the destination)</li><li>unbundle</li></ul></p><p><strong>This command is dangerous. Please use with care. </strong></p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py" line="1009"/> + <source>Administration</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgPurgeListDialog</name> @@ -24446,37 +24708,37 @@ <translation>Удалить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="117"/> <source>Unsaved Changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="118"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="117"/> <source>The guards list has been changed. Shall the changes be applied?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="239"/> <source>Remove Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="239"/> <source>Do you really want to remove the selected guards?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="308"/> <source>Apply Guard Definitions</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="308"/> <source><p>The defined guards could not be applied.</p><p>Reason: {0}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="306"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesDefineGuardsDialog.py" line="300"/> <source>The Mercurial process did not finish in time.</source> <translation type="unfinished"></translation> </message> @@ -24550,17 +24812,17 @@ <translation type="unfinished">Commit сообщение</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="107"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="101"/> <source>Process Generation Error</source> <translation type="unfinished">Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="107"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="101"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="197"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesHeaderDialog.py" line="189"/> <source>Error: </source> <translation type="unfinished"></translation> </message> @@ -24578,12 +24840,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="91"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListAllGuardsDialog.py" line="96"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> @@ -24668,42 +24930,42 @@ <translation></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="189"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="193"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="189"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="228"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="224"/> <source>no patches found</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="50"/> + <source>applied</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="52"/> - <source>applied</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="54"/> <source>guarded</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="55"/> - <source>missing</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="302"/> - <source>unknown</source> - <translation>неизвестный</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="53"/> + <source>missing</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="298"/> + <source>unknown</source> + <translation>неизвестный</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListDialog.py" line="51"/> <source>not applied</source> <translation type="unfinished"></translation> </message> @@ -24741,7 +25003,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesListGuardsDialog.py" line="122"/> <source>Unguarded</source> <translation type="unfinished"></translation> </message> @@ -24862,12 +25124,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="67"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="66"/> <source>Refresh</source> <translation>Обновить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="69"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/HgQueuesQueueManagementDialog.py" line="68"/> <source>Press to refresh the queues list</source> <translation type="unfinished"></translation> </message> @@ -24968,135 +25230,140 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="236"/> <source>Select to specify a revision by number</source> <translation type="unfinished">Задать ревизию порядковым номером</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="242"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="239"/> <source>Number</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="252"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="249"/> <source>Enter a revision number</source> <translation type="unfinished">Задайте номер ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="281"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="275"/> <source>Select to specify a revision by changeset id</source> <translation type="unfinished">Задать ревизию идентификатором изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="284"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="278"/> <source>Id:</source> <translation type="unfinished">Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="294"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="288"/> <source>Enter a changeset id</source> <translation type="unfinished">Задайте идентификатор изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="295"/> <source>Select to specify a revision by a tag</source> <translation type="unfinished">Задать ревизию с помощью метки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="304"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="298"/> <source>Tag:</source> <translation type="unfinished">Метка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="314"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="308"/> <source>Enter a tag name</source> <translation type="unfinished">Введите имя метки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="318"/> <source>Select to specify a revision by a branch</source> <translation type="unfinished">Задать ревизию с помощью имени ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="327"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="321"/> <source>Branch:</source> <translation type="unfinished">Ветвь:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="337"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="331"/> <source>Enter a branch name</source> <translation type="unfinished">Введите имя ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="347"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="341"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="344"/> <source>Bookmark:</source> <translation type="unfinished">Закладка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="360"/> <source>Enter a bookmark name</source> <translation type="unfinished">Введите имя закладки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="233"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="230"/> <source>&Destination Revision</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="370"/> <source>Select tip revision of repository</source> <translation type="unfinished">Головная ревизия репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="379"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> <source>TIP</source> - <translation type="unfinished">TIP</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="392"/> + <translation type="obsolete">TIP</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="386"/> <source>Select to collapse the rebased changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="389"/> <source>Collapse Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="396"/> <source>Select to keep the original changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="405"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="399"/> <source>Keep Original Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="412"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="406"/> <source>Select to keep the original branch names</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="409"/> <source>Keep Original Branch Name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="422"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="416"/> <source>Select to detach the source from its original branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="419"/> <source>Detach Source</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/HgRebaseDialog.ui" line="373"/> + <source>Current branch tip</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgRemoveSubrepositoriesDialog</name> @@ -25127,6 +25394,104 @@ </message> </context> <context> + <name>HgRepoConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="14"/> + <source>Mercurial Repository Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="23"/> + <source>Default</source> + <translation type="unfinished">По умолчанию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="93"/> + <source>Upstream URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="36"/> + <source>Enter the URL of the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="107"/> + <source>Username:</source> + <translation type="unfinished">Имя пользователя:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="50"/> + <source>Enter user name to acces the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="121"/> + <source>Password:</source> + <translation type="unfinished">Пароль:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="138"/> + <source>Press to show the password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="87"/> + <source>Default Push</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="100"/> + <source>Enter the URL of the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="114"/> + <source>Enter user name to acces the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="64"/> + <source>Enter the password to acces the upstream repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="128"/> + <source>Enter the password to acces the upstream (push) repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="151"/> + <source>Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="157"/> + <source>Minimum file size:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="164"/> + <source>Enter the minimum file size in MB for files to be treated as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="170"/> + <source> MB</source> + <translation type="unfinished">MB</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="196"/> + <source>Patterns:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRepoConfigDataDialog.ui" line="203"/> + <source>Enter file patterns (space separated) for files to be treated as Large Files</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgRevisionSelectionDialog</name> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="29"/> @@ -25144,42 +25509,42 @@ <translation>Задайте номер ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="68"/> <source>Select to specify a revision by changeset id</source> <translation>Задать ревизию идентификатором изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="74"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="71"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="84"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="81"/> <source>Enter a changeset id</source> <translation>Задайте идентификатор изменений</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="88"/> + <source>Select to specify a revision by a tag</source> + <translation>Задать ревизию с помощью метки</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="91"/> - <source>Select to specify a revision by a tag</source> - <translation>Задать ревизию с помощью метки</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="94"/> <source>Tag:</source> <translation>Метка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="107"/> <source>Enter a tag name</source> <translation>Введите имя метки</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="175"/> + <source>Select tip revision of repository</source> + <translation>Головная ревизия репозитория</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="178"/> - <source>Select tip revision of repository</source> - <translation>Головная ревизия репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="181"/> <source>TIP</source> <translation>TIP</translation> </message> @@ -25194,42 +25559,42 @@ <translation>Версия (ревизия)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="117"/> <source>Select to specify a revision by a branch</source> <translation>Задать ревизию с помощью имени ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="120"/> <source>Branch:</source> <translation>Ветвь:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="136"/> <source>Enter a branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="46"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="185"/> <source>No revision selected</source> <translation>Ревизия не выбрана</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.py" line="47"/> <source>Select to not specify a specific revision</source> - <translation>Не задавать конкретную ревизию</translation> + <translation type="obsolete">Не задавать конкретную ревизию</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="146"/> + <source>Select to specify a revision by a bookmark</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="149"/> - <source>Select to specify a revision by a bookmark</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="152"/> <source>Bookmark:</source> <translation type="unfinished">Закладка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="168"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionSelectionDialog.ui" line="165"/> <source>Enter a bookmark name</source> <translation type="unfinished">Введите имя закладки</translation> </message> @@ -25247,105 +25612,110 @@ <translation>Ревизия &1</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="204"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="208"/> <source>Select to specify a revision by number</source> <translation>Задать ревизию порядковым номером</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="207"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="211"/> <source>Number</source> <translation>Номер</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="217"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="221"/> <source>Enter a revision number</source> <translation>Задайте номер ревизии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="246"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="247"/> <source>Select to specify a revision by changeset id</source> <translation>Задать ревизию идентификатором изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="249"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="250"/> <source>Id:</source> <translation>Id:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="259"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="260"/> <source>Enter a changeset id</source> <translation>Задайте идентификатор изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="266"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="267"/> <source>Select to specify a revision by a tag</source> <translation>Задать ревизию с помощью метки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="270"/> <source>Tag:</source> <translation>Метка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="280"/> <source>Enter a tag name</source> <translation>Введите имя метки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="290"/> <source>Select to specify a revision by a branch</source> <translation>Задать ревизию с помощью имени ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="292"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="293"/> <source>Branch:</source> <translation>Ветвь:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="302"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="303"/> <source>Enter a branch name</source> <translation>Введите имя ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="341"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="342"/> <source>Select tip revision of repository</source> <translation>Головная ревизия репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="344"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="345"/> <source>TIP</source> <translation>TIP</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="354"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="355"/> <source>Select revision before last commit</source> <translation>Выбрать ревизию перед последней подачей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="358"/> <source>PREV</source> <translation>PREV</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="198"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="202"/> <source>Revision &2</source> <translation>Ревизия &2</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="312"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="313"/> <source>Select to specify a revision by a bookmark</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="315"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="316"/> <source>Bookmark:</source> <translation type="unfinished">Закладка:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="331"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="332"/> <source>Enter a bookmark name</source> <translation type="unfinished">Введите имя закладки</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgRevisionsSelectionDialog.ui" line="365"/> + <source>No revision selected</source> + <translation type="unfinished">Ревизия не выбрана</translation> + </message> </context> <context> <name>HgServeDialog</name> @@ -25385,12 +25755,12 @@ <translation>Просмотрщик</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="137"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgServeDialog.py" line="137"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -25401,9 +25771,225 @@ </message> </context> <context> + <name>HgShelveBrowserDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="14"/> + <source>Mercurial Shelve Browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="45"/> + <source>Name</source> + <translation type="unfinished">Имя</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="50"/> + <source>Age</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="55"/> + <source>Message</source> + <translation type="unfinished">Сообщение</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="69"/> + <source>Statistics</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="94"/> + <source>File</source> + <translation type="unfinished">Файл</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="99"/> + <source>Changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="104"/> + <source>Lines added</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="109"/> + <source>Lines deleted</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="156"/> + <source>Errors</source> + <translation type="unfinished">Ошибки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="178"/> + <source>Input</source> + <translation type="unfinished">Ввод</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="200"/> + <source>Press to send the input to the hg process</source> + <translation type="unfinished">Отправить данные процессу hg</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="203"/> + <source>&Send</source> + <translation type="unfinished">&Отправить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="206"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="213"/> + <source>Enter data to be sent to the hg process</source> + <translation type="unfinished">Задайте данные, которые будут посланы процессу hg</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="220"/> + <source>Select to switch the input field to password mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="223"/> + <source>&Password Mode</source> + <translation type="unfinished">&Парольный режим</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="226"/> + <source>Alt+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="47"/> + <source>&Refresh</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="49"/> + <source>Press to refresh the list of shelves</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="66"/> + <source>Restore selected shelve</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="68"/> + <source>Delete selected shelves</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="70"/> + <source>Delete all shelves</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="178"/> + <source>Process Generation Error</source> + <translation type="unfinished">Ошибка процесса генерации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="178"/> + <source>The process {0} could not be started. Ensure, that it is in the search path.</source> + <translation type="unfinished"></translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="361"/> + <source>%n file(s) changed</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="363"/> + <source>%n line(s) inserted</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.py" line="365"/> + <source>%n line(s) deleted</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveBrowserDialog.ui" line="162"/> + <source><b>Mercurial shelve errors</b><p>This shows possible error messages of the hg shelve command.</p></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgShelveDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="14"/> + <source>Shelve</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Имя:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="30"/> + <source>Enter a name for the shelve</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="37"/> + <source>Date, Time:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="46"/> + <source>Enter the commit date and time for the shelve</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="74"/> + <source>Message:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="84"/> + <source>Enter a message for the shelve</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="91"/> + <source>Mark new/missing files as added/removed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelveDataDialog.ui" line="49"/> + <source>yyyy-MM-dd HH:mm</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgShelvesSelectionDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgShelvesSelectionDialog.ui" line="14"/> + <source>Mercurial Shelve Selection</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>HgStatusDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="219"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="251"/> <source>Mercurial Status</source> <translation>Mercurial Status</translation> </message> @@ -25480,107 +26066,107 @@ <translation>Нажмите, чтобы обновить отображение статуса</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="77"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="78"/> <source>Commit changes to repository...</source> <translation>Зафиксировать изменения в репозитории...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="85"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="87"/> <source>Add to repository</source> <translation>Добавить в репозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="103"/> <source>Revert changes</source> <translation>Отмена изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="98"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="113"/> <source>Adjust column sizes</source> <translation>Подстроить размеры колонок</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="122"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="152"/> <source>added</source> <translation>добавлено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="155"/> <source>modified</source> <translation>изменено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="126"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="156"/> <source>removed</source> <translation>удалено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="127"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="157"/> <source>not tracked</source> <translation>не отслеживается</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="123"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="153"/> <source>normal</source> <translation>нормальный</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="154"/> <source>ignored</source> <translation>игнорировано</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="128"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="158"/> <source>missing</source> <translation>отсутствует</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="307"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="279"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="307"/> <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="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="647"/> <source>Commit</source> <translation>Зафиксировать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="736"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="813"/> <source>There are no uncommitted changes available/selected.</source> <translation>Нет доступных/выбранных неотправленных изменений.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="635"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="711"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="635"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="711"/> <source>There are no unversioned entries available/selected.</source> <translation>Нет/не выбраны неверсионные элементы.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="775"/> <source>Revert</source> <translation>Откатить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="99"/> <source>Remove from repository</source> - <translation>Удалить из репозитория</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="657"/> + <translation type="obsolete">Удалить из репозитория</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="734"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="775"/> <source>There are no missing entries available/selected.</source> <translation>Нет/не выбраны пропущенных элементы.</translation> </message> @@ -25655,17 +26241,17 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="87"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="97"/> <source>Show differences</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="109"/> <source>Restore missing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="497"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="522"/> <source>all</source> <translation type="unfinished"></translation> </message> @@ -25675,27 +26261,27 @@ <translation type="obsolete">Различие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="716"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="793"/> <source>Differences</source> <translation>Различия</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="647"/> <source>There are no entries selected to be committed.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="79"/> - <source>Select all for commit</source> - <translation>Выбрать все для фиксации</translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="81"/> + <source>Select all for commit</source> + <translation>Выбрать все для фиксации</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="83"/> <source>Deselect all from commit</source> <translation>Снять выделение</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="216"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="248"/> <source>Mercurial Queue Repository Status</source> <translation type="unfinished"></translation> </message> @@ -25710,30 +26296,45 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="820"/> <source>Side-by-Side Diff</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="743"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="820"/> <source>Only one file with uncommitted changes must be selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="89"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="100"/> <source>Show differences side-by-side</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="128"/> + <source>Add as Large File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="131"/> + <source>Add as Normal File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="106"/> + <source>Forget missing</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgStatusMonitorThread</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="161"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="154"/> <source>Mercurial status checked successfully</source> <translation>Статус Mercurial успешно проверен</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="104"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusMonitorThread.py" line="99"/> <source>Could not start the Mercurial process.</source> <translation>Невозможно запустить процесс Mercurial.</translation> </message> @@ -25751,212 +26352,212 @@ <translation type="unfinished">Ошибки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="40"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="38"/> <source>Refresh</source> <translation type="unfinished">Обновить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="42"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="40"/> <source>Press to refresh the summary display</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="107"/> <source>Process Generation Error</source> <translation type="unfinished">Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="107"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="328"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="333"/> <source><tr><td><b>Parent</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="332"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="337"/> <source><tr><td><b>Tags</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Метки</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="336"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="341"/> <source><tr><td><b>Commit Message</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="342"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="347"/> <source>empty repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="344"/> - <source>no revision checked out</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="345"/> - <source><tr><td><b>Remarks</b></td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="349"/> + <source>no revision checked out</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="350"/> + <source><tr><td><b>Remarks</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="354"/> <source><tr><td><b>Branch</b></td><td>{0}</td></tr></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="357"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="362"/> <source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source> <translation type="unfinished"><tr><td><b>Закладки:</b></td><td>{0}</td></tr></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="369"/> <source>{0} modified</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="371"/> <source>{0} added</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="373"/> <source>{0} removed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="370"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="375"/> <source>{0} renamed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="372"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="377"/> <source>{0} copied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="374"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="379"/> <source>{0} deleted</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="376"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="381"/> <source>{0} unknown</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="378"/> - <source>{0} ignored</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="380"/> - <source>{0} unresolved</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="383"/> - <source>{0} subrepos</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="386"/> - <source>Merge needed</source> + <source>{0} ignored</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="385"/> + <source>{0} unresolved</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="388"/> + <source>{0} subrepos</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="391"/> + <source>Merge needed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="393"/> <source>New Branch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="390"/> - <source>Head is closed</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="392"/> - <source>No commit required</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="394"/> - <source>New Branch Head</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="395"/> - <source><tr><td><b>Commit Status</b></td><td>{0}</td></tr></source> + <source>Head is closed</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="397"/> + <source>No commit required</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="399"/> + <source>New Branch Head</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="400"/> + <source><tr><td><b>Commit Status</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="405"/> <source>current</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="415"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="420"/> <source>unknown status</source> <translation type="unfinished">статус неизвестен</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="416"/> - <source><tr><td><b>Update Status</b></td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="421"/> + <source><tr><td><b>Update Status</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="426"/> <source>synched</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="425"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="430"/> <source>1 or more incoming</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="427"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="432"/> <source>{0} outgoing</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="436"/> - <source><tr><td><b>Remote Status</b></td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="441"/> + <source><tr><td><b>Remote Status</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="446"/> <source>empty queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="445"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="450"/> <source>{0} applied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="448"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="453"/> <source>{0} unapplied</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="451"/> - <source><tr><td><b>Queues Status</b></td><td>{0}</td></tr></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="456"/> + <source><tr><td><b>Queues Status</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="470"/> <source><p>No status information available.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="329"/> <source><tr><td><b>Parent #{0}</b></td><td>{1}</td></tr></source> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="407"/> <source>%n new changeset(s)<br/>Update required</source> <translation type="unfinished"> <numerusform></numerusform> @@ -25965,7 +26566,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="406"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="411"/> <source>%n new changeset(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -25974,7 +26575,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="408"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="413"/> <source>%n branch head(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -25983,13 +26584,13 @@ </translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="410"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="415"/> <source>{0}<br/>{1}<br/>Merge required</source> <comment>0 is changesets, 1 is branch heads</comment> <translation type="unfinished"></translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="430"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="435"/> <source>%n incoming bookmark(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -25998,7 +26599,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="433"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="438"/> <source>%n outgoing bookmark(s)</source> <translation type="unfinished"> <numerusform></numerusform> @@ -26006,6 +26607,25 @@ <numerusform></numerusform> </translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="461"/> + <source>No files to upload</source> + <translation type="unfinished"></translation> + </message> + <message numerus="yes"> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="463"/> + <source>%n file(s) to upload</source> + <translation type="unfinished"> + <numerusform></numerusform> + <numerusform></numerusform> + <numerusform></numerusform> + </translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgSummaryDialog.py" line="465"/> + <source><tr><td><b>Large Files</b></td><td>{0}</td></tr></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HgTagBranchListDialog</name> @@ -26094,32 +26714,32 @@ <translation>Alt+П</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="90"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="88"/> <source>Mercurial Branches List</source> <translation>Список ветвей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="89"/> <source>Status</source> <translation>Статус</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="132"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="135"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="132"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс {0}. Убедитесь, что он находится в пути поиска.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="255"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="251"/> <source>active</source> <translation>активный</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="260"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py" line="256"/> <source>yes</source> <translation>да</translation> </message> @@ -26127,75 +26747,75 @@ <context> <name>HgTagDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="39"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="36"/> <source>Enter the name of the tag</source> <translation>Задайте имя метки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="42"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="39"/> <source><b>Tag Name</b> <p>Enter the name of the tag to be created, moved or deleted.</p></source> <translation><b>Имя тега</b> <p>Задайте имя метки для создания, перемещеия или удаления</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="23"/> <source>Name:</source> <translation>Имя:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="66"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="70"/> <source>Tag Action</source> <translation>Действие метки</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="72"/> <source>Select to create a regular tag</source> - <translation>Выберите для создания обычной метки</translation> + <translation type="obsolete">Выберите для создания обычной метки</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="75"/> <source><b>Create Regular Tag</b> <p>Select this entry in order to create a regular tag.</p></source> - <translation><b>Создать обычную метку</b> + <translation type="obsolete"><b>Создать обычную метку</b> <p>Выберите этот пункт для создания обычной метки в репозитории.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="79"/> <source>Create Regular Tag</source> - <translation>Создать обычную метку</translation> + <translation type="obsolete">Создать обычную метку</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="89"/> <source>Select to create a local tag</source> - <translation>Выберите для создания локальной метки</translation> + <translation type="obsolete">Выберите для создания локальной метки</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="92"/> <source><b>Create Local Tag</b> <p>Select this entry in order to create a local tag.</p></source> - <translation><b>Создать локальную метку</b> + <translation type="obsolete"><b>Создать локальную метку</b> <p>Выберите этот пункт для создания локальной метки.</p></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="96"/> <source>Create Local Tag</source> - <translation>Создать локальную метку</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="103"/> + <translation type="obsolete">Создать локальную метку</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="93"/> <source>Select to delete a tag</source> <translation>Выберите для удаления метки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="96"/> <source><b>Delete Tag</b> <p>Select this entry in order to delete the selected tag.</p></source> <translation><b>Удалить метку</b> <p>Выберите этот пункт для удаления выбранной метки.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="100"/> <source>Delete Tag</source> <translation>Удалить метку</translation> </message> @@ -26204,6 +26824,253 @@ <source>Mercurial Tag</source> <translation>Метка</translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="56"/> + <source>Revision:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="63"/> + <source>Enter a revision to set a tag for</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="76"/> + <source>Select to create a tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="79"/> + <source><b>Create Tag</b> +<p>Select this entry in order to create a tag.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="83"/> + <source>Create Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="110"/> + <source>Tag Type</source> + <translation type="unfinished">Тип тега</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="116"/> + <source>Select to create/delete a global tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="119"/> + <source>Global Tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="129"/> + <source>Select to create/delete a local tag</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgTagDialog.ui" line="132"/> + <source>Local Tag</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgUnshelveDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="14"/> + <source>Dialog</source> + <translation type="obsolete">Диалог</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="23"/> + <source>Name:</source> + <translation type="unfinished">Имя:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="36"/> + <source>Enter the name of the shelve</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="46"/> + <source>Select to keep the shelved change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="49"/> + <source>Keep shelved change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/HgUnshelveDataDialog.ui" line="14"/> + <source>Mercurial Unshelve</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgUserConfigDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="14"/> + <source>Mercurial User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="23"/> + <source>User Data</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="29"/> + <source>First Name:</source> + <translation type="unfinished">Название фильтра:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="36"/> + <source>Enter the first name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="43"/> + <source>Last Name:</source> + <translation type="unfinished">Фамилия:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="50"/> + <source>Enter the last name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="57"/> + <source>Email:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="64"/> + <source>Enter the email address</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="74"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="80"/> + <source>Select to activate the bookmarks extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="83"/> + <source>Bookmarks</source> + <translation type="unfinished">Закладки</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="90"/> + <source>Select to activate the fetch extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="93"/> + <source>Fetch</source> + <translation type="unfinished">Запрос</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="100"/> + <source>Select to activate the GPG extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="103"/> + <source>GPG</source> + <translation type="unfinished">GPG</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="120"/> + <source>Select to activate the Purge extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="123"/> + <source>Purge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="130"/> + <source>Select to activate the queues extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="133"/> + <source>Queues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="143"/> + <source>Rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="160"/> + <source>Select to activate the transplant extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="163"/> + <source>Transplant</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="140"/> + <source>Select to activate the rebase extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="150"/> + <source>Select to activate the shelve extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="153"/> + <source>Shelve</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="110"/> + <source>Select to activate the largefiles extension</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="176"/> + <source>Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="182"/> + <source>Minimum file size:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="189"/> + <source>Enter the minimum file size in MB for files to be treated as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="195"/> + <source> MB</source> + <translation type="unfinished">MB</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="221"/> + <source>Patterns:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="228"/> + <source>Enter file patterns (space separated) for files to be treated as Large Files</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>HistoryDialog</name> @@ -26261,27 +27128,27 @@ <context> <name>HistoryManager</name> <message> - <location filename="../Helpviewer/History/HistoryManager.py" line="393"/> + <location filename="../Helpviewer/History/HistoryManager.py" line="395"/> <source>Loading History</source> <translation>Загрузка истории</translation> </message> <message> - <location filename="../Helpviewer/History/HistoryManager.py" line="508"/> + <location filename="../Helpviewer/History/HistoryManager.py" line="510"/> <source>Saving History</source> <translation>Сохранение истории</translation> </message> <message> - <location filename="../Helpviewer/History/HistoryManager.py" line="476"/> + <location filename="../Helpviewer/History/HistoryManager.py" line="478"/> <source><p>Unable to open history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation><p>Невозможно открыть файл истории <b>{0}</b>.<br/>Причина: {1}</p></translation> </message> <message> - <location filename="../Helpviewer/History/HistoryManager.py" line="499"/> + <location filename="../Helpviewer/History/HistoryManager.py" line="501"/> <source><p>Error removing old history file <b>{0}</b>.<br/>Reason: {1}</p></source> <translation>Ошибка при удалении файла историии <b>{0}</b>.<br/>Причина: {1}</translation> </message> <message> - <location filename="../Helpviewer/History/HistoryManager.py" line="508"/> + <location filename="../Helpviewer/History/HistoryManager.py" line="510"/> <source><p>Error moving new history file over old one (<b>{0}</b>).<br/>Reason: {1}</p></source> <translation>Ошибка перезаписи файла истории (<b>{0}</b>).<br/>Причина: {1}</translation> </message> @@ -26299,12 +27166,12 @@ <translation>Очистить историю...</translation> </message> <message> - <location filename="../Helpviewer/History/HistoryMenu.py" line="377"/> + <location filename="../Helpviewer/History/HistoryMenu.py" line="376"/> <source>Clear History</source> <translation>Очистить историю</translation> </message> <message> - <location filename="../Helpviewer/History/HistoryMenu.py" line="377"/> + <location filename="../Helpviewer/History/HistoryMenu.py" line="376"/> <source>Do you want to clear the history?</source> <translation>Очистить историю просмотров?</translation> </message> @@ -26319,12 +27186,12 @@ <translation>Закрыть вкладки</translation> </message> <message> - <location filename="../Helpviewer/History/HistoryMenu.py" line="400"/> + <location filename="../Helpviewer/History/HistoryMenu.py" line="399"/> <source>Restore All Closed Tabs</source> <translation>Восстановить все закрытые вкладки</translation> </message> <message> - <location filename="../Helpviewer/History/HistoryMenu.py" line="403"/> + <location filename="../Helpviewer/History/HistoryMenu.py" line="402"/> <source>Clear List</source> <translation>Очистить список</translation> </message> @@ -26483,47 +27350,47 @@ <translation>Вырезать выделение</translation> </message> <message> - <location filename="../IconEditor/IconEditorGrid.py" line="893"/> + <location filename="../IconEditor/IconEditorGrid.py" line="894"/> <source>Paste</source> <translation>Вставить</translation> </message> <message> - <location filename="../IconEditor/IconEditorGrid.py" line="893"/> + <location filename="../IconEditor/IconEditorGrid.py" line="894"/> <source><p>The clipboard image is larger than the current image.<br/>Paste as new image?</p></source> <translation><p>Рпзмер изображения в буфере обмена больше текущего.<br/>Вставить как новое изображение?</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorGrid.py" line="906"/> + <location filename="../IconEditor/IconEditorGrid.py" line="907"/> <source>Paste Clipboard</source> <translation>Вставить из буфера обмена</translation> </message> <message> - <location filename="../IconEditor/IconEditorGrid.py" line="924"/> + <location filename="../IconEditor/IconEditorGrid.py" line="925"/> <source>Pasting Image</source> <translation>Вставка изображения</translation> </message> <message> - <location filename="../IconEditor/IconEditorGrid.py" line="924"/> + <location filename="../IconEditor/IconEditorGrid.py" line="925"/> <source>Invalid image data in clipboard.</source> <translation>В буфере обмена испорченное изображение.</translation> </message> <message> - <location filename="../IconEditor/IconEditorGrid.py" line="935"/> + <location filename="../IconEditor/IconEditorGrid.py" line="936"/> <source>Paste Clipboard as New Image</source> <translation>Вставить из буфера обмена как новое изображение</translation> </message> <message> - <location filename="../IconEditor/IconEditorGrid.py" line="964"/> + <location filename="../IconEditor/IconEditorGrid.py" line="965"/> <source>Clear Image</source> <translation>Очистить изображение</translation> </message> <message> - <location filename="../IconEditor/IconEditorGrid.py" line="982"/> + <location filename="../IconEditor/IconEditorGrid.py" line="983"/> <source>Resize Image</source> <translation>Изменить размер изображения</translation> </message> <message> - <location filename="../IconEditor/IconEditorGrid.py" line="1009"/> + <location filename="../IconEditor/IconEditorGrid.py" line="1010"/> <source>Convert to Grayscale</source> <translation>Преобразовать в чёрно-белый</translation> </message> @@ -26589,596 +27456,596 @@ <context> <name>IconEditorWindow</name> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="125"/> + <location filename="../IconEditor/IconEditorWindow.py" line="124"/> <source>Windows Bitmap File (*.bmp)</source> <translation>Windows Bitmap файл (*.bmp)</translation> </message> <message> + <location filename="../IconEditor/IconEditorWindow.py" line="125"/> + <source>Graphic Interchange Format File (*.gif)</source> + <translation>GIF файл (*.gif)</translation> + </message> + <message> <location filename="../IconEditor/IconEditorWindow.py" line="126"/> - <source>Graphic Interchange Format File (*.gif)</source> - <translation>GIF файл (*.gif)</translation> + <source>Windows Icon File (*.ico)</source> + <translation>Файлы иконок (*.ico)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="127"/> - <source>Windows Icon File (*.ico)</source> - <translation>Файлы иконок (*.ico)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="128"/> <source>JPEG File (*.jpg)</source> <translation>JPEG файлы (*.jpg)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="131"/> + <location filename="../IconEditor/IconEditorWindow.py" line="130"/> <source>Portable Bitmap File (*.pbm)</source> <translation>Bitmap файл (*.bmp)</translation> </message> <message> + <location filename="../IconEditor/IconEditorWindow.py" line="132"/> + <source>Portable Graymap File (*.pgm)</source> + <translation>Graymap файл (*.pgm)</translation> + </message> + <message> <location filename="../IconEditor/IconEditorWindow.py" line="133"/> - <source>Portable Graymap File (*.pgm)</source> - <translation>Graymap файл (*.pgm)</translation> + <source>Portable Network Graphics File (*.png)</source> + <translation>PNG файл (*.png)</translation> </message> <message> <location filename="../IconEditor/IconEditorWindow.py" line="134"/> - <source>Portable Network Graphics File (*.png)</source> - <translation>PNG файл (*.png)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="135"/> <source>Portable Pixmap File (*.ppm)</source> <translation>Pixmap файл (*.ppm)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="137"/> + <location filename="../IconEditor/IconEditorWindow.py" line="136"/> <source>Scalable Vector Graphics File (*.svg)</source> <translation>SVG файл (*.svg)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="141"/> + <location filename="../IconEditor/IconEditorWindow.py" line="140"/> <source>TIFF File (*.tif)</source> <translation>TIFF файл (*.tif)</translation> </message> <message> + <location filename="../IconEditor/IconEditorWindow.py" line="143"/> + <source>X11 Bitmap File (*.xbm)</source> + <translation>X11 Bitmap файл (*.xbm)</translation> + </message> + <message> <location filename="../IconEditor/IconEditorWindow.py" line="144"/> - <source>X11 Bitmap File (*.xbm)</source> - <translation>X11 Bitmap файл (*.xbm)</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="145"/> <source>X11 Pixmap File (*.xpm)</source> <translation>X11 Pixmap файл (*.xpm)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="156"/> + <location filename="../IconEditor/IconEditorWindow.py" line="155"/> <source>All Files (*)</source> <translation>Все файлы (*)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="188"/> + <location filename="../IconEditor/IconEditorWindow.py" line="187"/> <source>New</source> <translation>Новый</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="188"/> + <location filename="../IconEditor/IconEditorWindow.py" line="187"/> <source>&New</source> <translation>&Новый</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="188"/> + <location filename="../IconEditor/IconEditorWindow.py" line="187"/> <source>Ctrl+N</source> <comment>File|New</comment> <translation>Ctrl+N</translation> </message> <message> + <location filename="../IconEditor/IconEditorWindow.py" line="193"/> + <source>Create a new icon</source> + <translation>Создать новую иконку</translation> + </message> + <message> <location filename="../IconEditor/IconEditorWindow.py" line="194"/> - <source>Create a new icon</source> - <translation>Создать новую иконку</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="195"/> <source><b>New</b><p>This creates a new icon.</p></source> <translation><b>Новый</b><p>Создать новую иконку.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="202"/> + <location filename="../IconEditor/IconEditorWindow.py" line="201"/> <source>New Window</source> <translation>Новое окно</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="202"/> + <location filename="../IconEditor/IconEditorWindow.py" line="201"/> <source>New &Window</source> <translation>&Новое окно</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="207"/> + <location filename="../IconEditor/IconEditorWindow.py" line="206"/> <source>Open a new icon editor window</source> <translation>Открыть новый редактор иконок</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="209"/> + <location filename="../IconEditor/IconEditorWindow.py" line="208"/> <source><b>New Window</b><p>This opens a new icon editor window.</p></source> <translation><b>Новое окно</b><p>Открыть новый редактор иконок.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="216"/> + <location filename="../IconEditor/IconEditorWindow.py" line="215"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="216"/> + <location filename="../IconEditor/IconEditorWindow.py" line="215"/> <source>&Open...</source> <translation>&Открыть...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="216"/> + <location filename="../IconEditor/IconEditorWindow.py" line="215"/> <source>Ctrl+O</source> <comment>File|Open</comment> <translation>Ctrl+O</translation> </message> <message> + <location filename="../IconEditor/IconEditorWindow.py" line="221"/> + <source>Open an icon file for editing</source> + <translation>Открыть файл иконки для редактирования</translation> + </message> + <message> <location filename="../IconEditor/IconEditorWindow.py" line="222"/> - <source>Open an icon file for editing</source> - <translation>Открыть файл иконки для редактирования</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="223"/> <source><b>Open File</b><p>This opens a new icon file for editing. It pops up a file selection dialog.</p></source> <translation><b>Открыть файл</b><p>Открыть файл иконки для редактирования.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="231"/> + <location filename="../IconEditor/IconEditorWindow.py" line="230"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="231"/> + <location filename="../IconEditor/IconEditorWindow.py" line="230"/> <source>&Save</source> <translation>&Сохранить</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="231"/> + <location filename="../IconEditor/IconEditorWindow.py" line="230"/> <source>Ctrl+S</source> <comment>File|Save</comment> <translation>Ctrl+S</translation> </message> <message> + <location filename="../IconEditor/IconEditorWindow.py" line="236"/> + <source>Save the current icon</source> + <translation>Сохранить текущую иконку</translation> + </message> + <message> <location filename="../IconEditor/IconEditorWindow.py" line="237"/> - <source>Save the current icon</source> - <translation>Сохранить текущую иконку</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="238"/> <source><b>Save File</b><p>Save the contents of the icon editor window.</p></source> <translation><b>Сохранить файл</b><p>Сохранить текущую иконку.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="245"/> + <location filename="../IconEditor/IconEditorWindow.py" line="244"/> <source>Save As</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="245"/> + <location filename="../IconEditor/IconEditorWindow.py" line="244"/> <source>Save &As...</source> <translation>Сохранить &как...</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="245"/> + <location filename="../IconEditor/IconEditorWindow.py" line="244"/> <source>Shift+Ctrl+S</source> <comment>File|Save As</comment> <translation>Shift+Ctrl+S</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="251"/> + <location filename="../IconEditor/IconEditorWindow.py" line="250"/> <source>Save the current icon to a new file</source> <translation>Сохранить текущую иконку в новый файл</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="253"/> + <location filename="../IconEditor/IconEditorWindow.py" line="252"/> <source><b>Save As...</b><p>Saves the current icon to a new file.</p></source> <translation><b>Сохранить как...</b><p>Сохранить текущую иконку в новый файл.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="260"/> + <location filename="../IconEditor/IconEditorWindow.py" line="259"/> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="260"/> + <location filename="../IconEditor/IconEditorWindow.py" line="259"/> <source>&Close</source> <translation>&Закрыть</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="260"/> + <location filename="../IconEditor/IconEditorWindow.py" line="259"/> <source>Ctrl+W</source> <comment>File|Close</comment> <translation>Ctrl+W</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="266"/> + <location filename="../IconEditor/IconEditorWindow.py" line="265"/> <source>Close the current icon editor window</source> <translation>Закрыть текущий редактор иконок</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="268"/> + <location filename="../IconEditor/IconEditorWindow.py" line="267"/> <source><b>Close</b><p>Closes the current icon editor window.</p></source> <translation><b>Закрыть</b><p>Закрыть текущий редактор иконок.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="275"/> + <location filename="../IconEditor/IconEditorWindow.py" line="274"/> <source>Close All</source> <translation>Закрыть всё</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="275"/> + <location filename="../IconEditor/IconEditorWindow.py" line="274"/> <source>Close &All</source> <translation>Закрыть &всё</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="279"/> + <location filename="../IconEditor/IconEditorWindow.py" line="278"/> <source>Close all icon editor windows</source> <translation>Закрыть все редакторы иконок</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="281"/> + <location filename="../IconEditor/IconEditorWindow.py" line="280"/> <source><b>Close All</b><p>Closes all icon editor windows except the first one.</p></source> <translation><b>Закрыть все</b><p>Закрыть все редакторы иконок кроме первого.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="288"/> + <location filename="../IconEditor/IconEditorWindow.py" line="287"/> <source>Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="288"/> + <location filename="../IconEditor/IconEditorWindow.py" line="287"/> <source>&Quit</source> <translation>&Выход</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="288"/> + <location filename="../IconEditor/IconEditorWindow.py" line="287"/> <source>Ctrl+Q</source> <comment>File|Quit</comment> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="294"/> + <location filename="../IconEditor/IconEditorWindow.py" line="293"/> <source>Quit the icon editor</source> <translation>Закрыть редактор иконок</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="295"/> + <location filename="../IconEditor/IconEditorWindow.py" line="294"/> <source><b>Quit</b><p>Quit the icon editor.</p></source> <translation><b>Закрыть</b><p>Закрыть редактор иконок.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="307"/> + <location filename="../IconEditor/IconEditorWindow.py" line="306"/> <source>Undo</source> <translation>Отмена</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="307"/> + <location filename="../IconEditor/IconEditorWindow.py" line="306"/> <source>&Undo</source> <translation>&Отмена</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="307"/> + <location filename="../IconEditor/IconEditorWindow.py" line="306"/> <source>Ctrl+Z</source> <comment>Edit|Undo</comment> <translation>Ctrl+Z</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="307"/> + <location filename="../IconEditor/IconEditorWindow.py" line="306"/> <source>Alt+Backspace</source> <comment>Edit|Undo</comment> <translation>Alt+Backspace</translation> </message> <message> + <location filename="../IconEditor/IconEditorWindow.py" line="313"/> + <source>Undo the last change</source> + <translation>Отменить последнее изменение</translation> + </message> + <message> <location filename="../IconEditor/IconEditorWindow.py" line="314"/> - <source>Undo the last change</source> - <translation>Отменить последнее изменение</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="315"/> <source><b>Undo</b><p>Undo the last change done.</p></source> <translation><b>Отменить</b><p>Отменить последнее изменение.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="321"/> <source>Redo</source> <translation>Повтор</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="321"/> <source>&Redo</source> <translation>&Повтор</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="322"/> + <location filename="../IconEditor/IconEditorWindow.py" line="321"/> <source>Ctrl+Shift+Z</source> <comment>Edit|Redo</comment> <translation>Ctrl+Shift+Z</translation> </message> <message> + <location filename="../IconEditor/IconEditorWindow.py" line="327"/> + <source>Redo the last change</source> + <translation>Восстановить последнее отменённое изменение</translation> + </message> + <message> <location filename="../IconEditor/IconEditorWindow.py" line="328"/> - <source>Redo the last change</source> - <translation>Восстановить последнее отменённое изменение</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="329"/> <source><b>Redo</b><p>Redo the last change done.</p></source> <translation><b>Восстановить</b><p>Восстановить последнее отменённое изменение.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="336"/> + <location filename="../IconEditor/IconEditorWindow.py" line="335"/> <source>Cut</source> <translation>Вырезать</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="336"/> + <location filename="../IconEditor/IconEditorWindow.py" line="335"/> <source>Cu&t</source> <translation>В&ырезать</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="336"/> + <location filename="../IconEditor/IconEditorWindow.py" line="335"/> <source>Ctrl+X</source> <comment>Edit|Cut</comment> <translation>Ctrl+X</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="336"/> + <location filename="../IconEditor/IconEditorWindow.py" line="335"/> <source>Shift+Del</source> <comment>Edit|Cut</comment> <translation>Shift+Del</translation> </message> <message> + <location filename="../IconEditor/IconEditorWindow.py" line="342"/> + <source>Cut the selection</source> + <translation>Вырезать выделение</translation> + </message> + <message> <location filename="../IconEditor/IconEditorWindow.py" line="343"/> - <source>Cut the selection</source> - <translation>Вырезать выделение</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="344"/> <source><b>Cut</b><p>Cut the selected image area to the clipboard.</p></source> <translation><b>Вырезать</b><p>Переместить выделенное изображение в буфер обмена.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="350"/> <source>Copy</source> <translation>Копировать</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="350"/> <source>&Copy</source> <translation>&Копировать</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="350"/> <source>Ctrl+C</source> <comment>Edit|Copy</comment> <translation>Ctrl+C</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="351"/> + <location filename="../IconEditor/IconEditorWindow.py" line="350"/> <source>Ctrl+Ins</source> <comment>Edit|Copy</comment> <translation>Ctrl+Ins</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="358"/> + <location filename="../IconEditor/IconEditorWindow.py" line="357"/> <source>Copy the selection</source> <translation>Копировать выделение</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="359"/> + <location filename="../IconEditor/IconEditorWindow.py" line="358"/> <source><b>Copy</b><p>Copy the selected image area to the clipboard.</p></source> <translation><b>Копировать</b><p>Копировать выделенное изображение в буфер обмена.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="365"/> <source>Paste</source> <translation>Вставить</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="365"/> <source>&Paste</source> <translation>Вс&тавить</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="365"/> <source>Ctrl+V</source> <comment>Edit|Paste</comment> <translation>Ctrl+V</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="366"/> + <location filename="../IconEditor/IconEditorWindow.py" line="365"/> <source>Shift+Ins</source> <comment>Edit|Paste</comment> <translation>Shift+Ins</translation> </message> <message> + <location filename="../IconEditor/IconEditorWindow.py" line="372"/> + <source>Paste the clipboard image</source> + <translation>Вставить изображение из буфера обмена</translation> + </message> + <message> <location filename="../IconEditor/IconEditorWindow.py" line="373"/> - <source>Paste the clipboard image</source> - <translation>Вставить изображение из буфера обмена</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="374"/> <source><b>Paste</b><p>Paste the clipboard image.</p></source> <translation><b>Вставить</b><p>Вставить изображение из буфера обмена.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="380"/> <source>Paste as New</source> <translation>Вставить как новое</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="381"/> + <location filename="../IconEditor/IconEditorWindow.py" line="380"/> <source>Paste as &New</source> <translation>Вставить как &новое</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="385"/> + <location filename="../IconEditor/IconEditorWindow.py" line="384"/> <source>Paste the clipboard image replacing the current one</source> <translation>Вставить изображение из буфера обмена вместо текущего</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="387"/> + <location filename="../IconEditor/IconEditorWindow.py" line="386"/> <source><b>Paste as New</b><p>Paste the clipboard image replacing the current one.</p></source> <translation><b>Вставить как новое</b><p>Вставить изображение из буфера обмена вместо текущего.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="394"/> + <location filename="../IconEditor/IconEditorWindow.py" line="393"/> <source>Clear</source> <translation>Очистить</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="394"/> + <location filename="../IconEditor/IconEditorWindow.py" line="393"/> <source>Cl&ear</source> <translation>О&чистить</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="394"/> + <location filename="../IconEditor/IconEditorWindow.py" line="393"/> <source>Alt+Shift+C</source> <comment>Edit|Clear</comment> <translation>Alt+Shift+C</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="401"/> + <location filename="../IconEditor/IconEditorWindow.py" line="400"/> <source>Clear the icon image</source> <translation>Очистить изображение иконки</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="402"/> + <location filename="../IconEditor/IconEditorWindow.py" line="401"/> <source><b>Clear</b><p>Clear the icon image and set it to be completely transparent.</p></source> <translation><b>Очистить</b><p>Очистить изображение иконки и сдерать его прозрачным.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="410"/> + <location filename="../IconEditor/IconEditorWindow.py" line="409"/> <source>Select All</source> <translation>Выбрать всё</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="410"/> + <location filename="../IconEditor/IconEditorWindow.py" line="409"/> <source>&Select All</source> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="410"/> + <location filename="../IconEditor/IconEditorWindow.py" line="409"/> <source>Ctrl+A</source> <comment>Edit|Select All</comment> <translation>Ctrl+A</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="416"/> + <location filename="../IconEditor/IconEditorWindow.py" line="415"/> <source>Select the complete icon image</source> <translation>Выберите завершённую иконку</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="418"/> + <location filename="../IconEditor/IconEditorWindow.py" line="417"/> <source><b>Select All</b><p>Selects the complete icon image.</p></source> <translation><b>Выбрать всё</b><p>Выберите завершённую иконку.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="424"/> <source>Change Size</source> <translation>Изменить размер</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="425"/> + <location filename="../IconEditor/IconEditorWindow.py" line="424"/> <source>Change Si&ze...</source> <translation>Изменить ра&змер...</translation> </message> <message> + <location filename="../IconEditor/IconEditorWindow.py" line="430"/> + <source>Change the icon size</source> + <translation>Изменить размер иконки</translation> + </message> + <message> <location filename="../IconEditor/IconEditorWindow.py" line="431"/> - <source>Change the icon size</source> - <translation>Изменить размер иконки</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="432"/> <source><b>Change Size...</b><p>Changes the icon size.</p></source> <translation><b>Изменить размер...</b><p>Изменить размер иконки.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="439"/> + <location filename="../IconEditor/IconEditorWindow.py" line="438"/> <source>Grayscale</source> <translation>Оттенки серого</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="439"/> + <location filename="../IconEditor/IconEditorWindow.py" line="438"/> <source>&Grayscale</source> <translation>Оттенки &серого</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="445"/> + <location filename="../IconEditor/IconEditorWindow.py" line="444"/> <source>Change the icon to grayscale</source> <translation>Изменить цвет иконки на серый</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="447"/> + <location filename="../IconEditor/IconEditorWindow.py" line="446"/> <source><b>Grayscale</b><p>Changes the icon to grayscale.</p></source> <translation><b>Оттенки серого</b><p>Изменить цвет иконки на серый.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="476"/> + <location filename="../IconEditor/IconEditorWindow.py" line="475"/> <source>Zoom in</source> <translation>Увеличить масштаб</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="476"/> + <location filename="../IconEditor/IconEditorWindow.py" line="475"/> <source>Zoom &in</source> <translation>У&величить масштаб</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="476"/> + <location filename="../IconEditor/IconEditorWindow.py" line="475"/> <source>Ctrl++</source> <comment>View|Zoom in</comment> <translation>Ctrl++</translation> </message> <message> + <location filename="../IconEditor/IconEditorWindow.py" line="481"/> + <source>Zoom in on the icon</source> + <translation>Увеличить масштаб</translation> + </message> + <message> <location filename="../IconEditor/IconEditorWindow.py" line="482"/> - <source>Zoom in on the icon</source> - <translation>Увеличить масштаб</translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="483"/> <source><b>Zoom in</b><p>Zoom in on the icon. This makes the grid bigger.</p></source> <translation><b>Увеличить масштаб</b><p>Укрупнить сетку.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="490"/> + <location filename="../IconEditor/IconEditorWindow.py" line="489"/> <source>Zoom out</source> <translation>Уменьшить масштаб</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="490"/> + <location filename="../IconEditor/IconEditorWindow.py" line="489"/> <source>Zoom &out</source> <translation>У&меньшить масштаб</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="490"/> + <location filename="../IconEditor/IconEditorWindow.py" line="489"/> <source>Ctrl+-</source> <comment>View|Zoom out</comment> <translation>Ctrl+-</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="496"/> + <location filename="../IconEditor/IconEditorWindow.py" line="495"/> <source>Zoom out on the icon</source> <translation>Уменьшить масштаб</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="497"/> + <location filename="../IconEditor/IconEditorWindow.py" line="496"/> <source><b>Zoom out</b><p>Zoom out on the icon. This makes the grid smaller.</p></source> <translation><b>Уменьшить масштаб</b><p>Сделать сетку мельче.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="504"/> + <location filename="../IconEditor/IconEditorWindow.py" line="503"/> <source>Zoom reset</source> <translation>Сбросить масштаб</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="504"/> + <location filename="../IconEditor/IconEditorWindow.py" line="503"/> <source>Zoom &reset</source> <translation>&Сбросить масштаб</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="504"/> + <location filename="../IconEditor/IconEditorWindow.py" line="503"/> <source>Ctrl+0</source> <comment>View|Zoom reset</comment> <translation>Ctrl+0</translation> @@ -27210,279 +28077,279 @@ <translation type="obsolete"><b>Масштаб</b><p>Открыть диалог изменения масштаба.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="520"/> + <location filename="../IconEditor/IconEditorWindow.py" line="519"/> <source>Show Grid</source> <translation>Показать сетку</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="520"/> + <location filename="../IconEditor/IconEditorWindow.py" line="519"/> <source>Show &Grid</source> <translation>Показать &сетку</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="526"/> + <location filename="../IconEditor/IconEditorWindow.py" line="525"/> <source>Toggle the display of the grid</source> <translation>Переключить изображение сетки</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="528"/> + <location filename="../IconEditor/IconEditorWindow.py" line="527"/> <source><b>Show Grid</b><p>Toggle the display of the grid.</p></source> <translation><b>Показать сетку</b><p>Переключить изображение сетки.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="547"/> + <location filename="../IconEditor/IconEditorWindow.py" line="546"/> <source>Freehand</source> <translation>Произвольный рисунок</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="547"/> + <location filename="../IconEditor/IconEditorWindow.py" line="546"/> <source>&Freehand</source> <translation>&Произвольный рисунок</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="553"/> + <location filename="../IconEditor/IconEditorWindow.py" line="552"/> <source><b>Free hand</b><p>Draws non linear lines.</p></source> <translation><b>Произвольный рисунок</b><p>Рисовать произвольные линии.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="561"/> <source>Color Picker</source> <translation>Выбрать цвет</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="562"/> + <location filename="../IconEditor/IconEditorWindow.py" line="561"/> <source>&Color Picker</source> <translation>&Выбрать цвет</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="568"/> + <location filename="../IconEditor/IconEditorWindow.py" line="567"/> <source><b>Color Picker</b><p>The color of the pixel clicked on will become the current draw color.</p></source> <translation><b>Выбрать цвет</b><p>Этот диалог поможет выбрать цвет для рисования.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="579"/> + <location filename="../IconEditor/IconEditorWindow.py" line="578"/> <source>Rectangle</source> <translation>Прямоугольник</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="579"/> + <location filename="../IconEditor/IconEditorWindow.py" line="578"/> <source>&Rectangle</source> <translation>&Прямоугольник</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="585"/> + <location filename="../IconEditor/IconEditorWindow.py" line="584"/> <source><b>Rectangle</b><p>Draw a rectangle.</p></source> <translation><b>Прямоугольник</b><p>Рисовать прямоугольник.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="593"/> <source>Filled Rectangle</source> <translation>Закрашенный прямоугольник</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="594"/> + <location filename="../IconEditor/IconEditorWindow.py" line="593"/> <source>F&illed Rectangle</source> <translation>З&акрашенный прямоугольник</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="600"/> + <location filename="../IconEditor/IconEditorWindow.py" line="599"/> <source><b>Filled Rectangle</b><p>Draw a filled rectangle.</p></source> <translation><b>Закрашенный прямоугольник</b><p>Рисовать закрашенный прямоугольник.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="610"/> + <location filename="../IconEditor/IconEditorWindow.py" line="609"/> <source>Circle</source> <translation>Окружность</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="616"/> + <location filename="../IconEditor/IconEditorWindow.py" line="615"/> <source><b>Circle</b><p>Draw a circle.</p></source> <translation><b>Окружность</b><p>Рисовать окружность.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="625"/> + <location filename="../IconEditor/IconEditorWindow.py" line="624"/> <source>Filled Circle</source> <translation>Закрашенная окружность</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="625"/> + <location filename="../IconEditor/IconEditorWindow.py" line="624"/> <source>Fille&d Circle</source> <translation>Закраше&нная окружность</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="631"/> + <location filename="../IconEditor/IconEditorWindow.py" line="630"/> <source><b>Filled Circle</b><p>Draw a filled circle.</p></source> <translation><b>Закрашенная окружность</b><p>Рисовать закрашенную окружность.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="641"/> + <location filename="../IconEditor/IconEditorWindow.py" line="640"/> <source>Ellipse</source> <translation>Эллипс</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="641"/> + <location filename="../IconEditor/IconEditorWindow.py" line="640"/> <source>&Ellipse</source> <translation>&Эллипс</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="647"/> + <location filename="../IconEditor/IconEditorWindow.py" line="646"/> <source><b>Ellipse</b><p>Draw an ellipse.</p></source> <translation><b>Эллипс</b><p>Рисовать эллипс.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="655"/> <source>Filled Ellipse</source> <translation>Закрашенный Эллипс</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="656"/> + <location filename="../IconEditor/IconEditorWindow.py" line="655"/> <source>Fille&d Elli&pse</source> <translation>Закраш&енный Эллипс</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="662"/> + <location filename="../IconEditor/IconEditorWindow.py" line="661"/> <source><b>Filled Ellipse</b><p>Draw a filled ellipse.</p></source> <translation><b>Закрашенный Эллипс</b><p>Рисовать закрашенный эллипс.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="672"/> + <location filename="../IconEditor/IconEditorWindow.py" line="671"/> <source>Flood Fill</source> <translation>Закрашивать</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="672"/> + <location filename="../IconEditor/IconEditorWindow.py" line="671"/> <source>Fl&ood Fill</source> <translation>Закра&шивать</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="678"/> + <location filename="../IconEditor/IconEditorWindow.py" line="677"/> <source><b>Flood Fill</b><p>Fill adjoining pixels with the same color with the current color.</p></source> <translation><b>Закрашивать</b><p>Закрашивать текущим цветом.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="688"/> + <location filename="../IconEditor/IconEditorWindow.py" line="687"/> <source>Line</source> <translation>Линия</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="688"/> + <location filename="../IconEditor/IconEditorWindow.py" line="687"/> <source>&Line</source> <translation>&Линия</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="694"/> + <location filename="../IconEditor/IconEditorWindow.py" line="693"/> <source><b>Line</b><p>Draw a line.</p></source> <translation><b>Линия</b><p>Рисовать линию.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="702"/> <source>Eraser (Transparent)</source> <translation>Ластик</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="703"/> + <location filename="../IconEditor/IconEditorWindow.py" line="702"/> <source>Eraser (&Transparent)</source> <translation>Ласти&к</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="709"/> + <location filename="../IconEditor/IconEditorWindow.py" line="708"/> <source><b>Eraser (Transparent)</b><p>Erase pixels by setting them to transparent.</p></source> <translation><b>Ластик</b><p>Очистить пикселы.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="718"/> + <location filename="../IconEditor/IconEditorWindow.py" line="717"/> <source>Rectangular Selection</source> <translation>Прямоугольное выделение</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="735"/> + <location filename="../IconEditor/IconEditorWindow.py" line="734"/> <source>Rect&angular Selection</source> <translation>Прям&оугольное выделение</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="724"/> + <location filename="../IconEditor/IconEditorWindow.py" line="723"/> <source><b>Rectangular Selection</b><p>Select a rectangular section of the icon using the mouse.</p></source> <translation><b>Прямоугольное выделение</b><p>Выбрать прямоугольную область с помощью мышки.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="735"/> + <location filename="../IconEditor/IconEditorWindow.py" line="734"/> <source>Circular Selection</source> <translation>Выделение окружности</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="741"/> + <location filename="../IconEditor/IconEditorWindow.py" line="740"/> <source><b>Circular Selection</b><p>Select a circular section of the icon using the mouse.</p></source> <translation><b>Выделение окружности</b><p>Выбрать круглую область с помощью мышки.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="758"/> + <location filename="../IconEditor/IconEditorWindow.py" line="757"/> <source>About</source> <translation>О</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="758"/> + <location filename="../IconEditor/IconEditorWindow.py" line="757"/> <source>&About</source> <translation>&О</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="762"/> + <location filename="../IconEditor/IconEditorWindow.py" line="761"/> <source>Display information about this software</source> <translation>Информация о ПО</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="764"/> + <location filename="../IconEditor/IconEditorWindow.py" line="763"/> <source><b>About</b><p>Display some information about this software.</p></source> <translation><b>О...</b><p>Информация об этом программном продукте.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="770"/> + <location filename="../IconEditor/IconEditorWindow.py" line="769"/> <source>About Qt</source> <translation>О Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="770"/> + <location filename="../IconEditor/IconEditorWindow.py" line="769"/> <source>About &Qt</source> <translation>О &Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="774"/> + <location filename="../IconEditor/IconEditorWindow.py" line="773"/> <source>Display information about the Qt toolkit</source> <translation>Информация о библиотеке Qt</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="776"/> + <location filename="../IconEditor/IconEditorWindow.py" line="775"/> <source><b>About Qt</b><p>Display some information about the Qt toolkit.</p></source> <translation><b>О Qt</b><p>Информация о библиотеке Qt.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="783"/> + <location filename="../IconEditor/IconEditorWindow.py" line="782"/> <source>What's This?</source> <translation>Что это?</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="783"/> + <location filename="../IconEditor/IconEditorWindow.py" line="782"/> <source>&What's This?</source> <translation>&Что это?</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="783"/> + <location filename="../IconEditor/IconEditorWindow.py" line="782"/> <source>Shift+F1</source> <comment>Help|What's This?'</comment> <translation>Shift+F1</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="789"/> + <location filename="../IconEditor/IconEditorWindow.py" line="788"/> <source>Context sensitive help</source> <translation>Контекстная помощь</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="790"/> + <location filename="../IconEditor/IconEditorWindow.py" line="789"/> <source><b>Display context sensitive help</b><p>In What's This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.</p></source> <translation><b>Показать контекстную помощь</b> <p>В режиме контекстной помощи курсор мыши выглядит как стрелка со знаком вопроса, и, щёлкнув по элементу интерфейса, Вы можете просмотреть краткую помощь о его роли и его использовании. В диалогах можно воспользоваться кнопкой контекстной помощи в заголовке окна.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="807"/> + <location filename="../IconEditor/IconEditorWindow.py" line="806"/> <source>&File</source> <translation>&Файл</translation> </message> @@ -27577,32 +28444,32 @@ <translation>Редактор иконок</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="130"/> + <location filename="../IconEditor/IconEditorWindow.py" line="129"/> <source>Multiple-Image Network Graphics File (*.mng)</source> <translation></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="510"/> + <location filename="../IconEditor/IconEditorWindow.py" line="509"/> <source>Reset the zoom of the icon</source> <translation>Сбросить масштаб</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="512"/> + <location filename="../IconEditor/IconEditorWindow.py" line="511"/> <source><b>Zoom reset</b><p>Reset the zoom of the icon. This sets the zoom factor to 100%.</p></source> <translation><b>Сбросить масштаб</b><p>Установить масштаб 1:1.</p></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="132"/> + <location filename="../IconEditor/IconEditorWindow.py" line="131"/> <source>Paintbrush Bitmap File (*.pcx)</source> <translation>Paintbrush Bitmap файл (*.pcx)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="136"/> + <location filename="../IconEditor/IconEditorWindow.py" line="135"/> <source>Silicon Graphics Image File (*.sgi)</source> <translation>Silicon Graphics Image файл (*.sgi)</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="140"/> + <location filename="../IconEditor/IconEditorWindow.py" line="139"/> <source>Targa Graphic File (*.tga)</source> <translation>Targa Graphic файл (*.tga)</translation> </message> @@ -27651,22 +28518,22 @@ <translation>Изменения в иконке не сохранены.</translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="129"/> + <location filename="../IconEditor/IconEditorWindow.py" line="128"/> <source>JPEG File (*.jpeg)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../IconEditor/IconEditorWindow.py" line="138"/> + <location filename="../IconEditor/IconEditorWindow.py" line="137"/> <source>Compressed Scalable Vector Graphics File (*.svgz)</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../IconEditor/IconEditorWindow.py" line="141"/> + <source>TIFF File (*.tiff)</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../IconEditor/IconEditorWindow.py" line="142"/> - <source>TIFF File (*.tiff)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../IconEditor/IconEditorWindow.py" line="143"/> <source>WAP Bitmap File (*.wbmp)</source> <translation type="unfinished"></translation> </message> @@ -27730,72 +28597,72 @@ <context> <name>IconsPage</name> <message> - <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="51"/> + <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="52"/> <source>Delete</source> <translation>Удалить</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="61"/> + <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="62"/> <source>Press to add the entered directory to the list</source> <translation>Добавить заданный каталог в список</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="64"/> + <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="65"/> <source>Add</source> <translation>Добавить</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="71"/> + <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="72"/> <source>Enter a directory to be added</source> <translation>Задайте добавляемый каталог</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="78"/> + <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="79"/> <source>Press to select an icon directory via a selection dialog</source> <translation>Выбрать каталог с помощью файлового диалога</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="81"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="93"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="91"/> <source>Show</source> <translation>Показать</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="121"/> + <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="119"/> <source>Up</source> <translation>Вверх</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="131"/> + <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="129"/> <source>Down</source> <translation>Вниз</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="156"/> + <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="154"/> <source>List of icon directories</source> <translation>Список каталогов пиктограмм</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IconsPage.py" line="127"/> + <location filename="../Preferences/ConfigurationPages/IconsPage.py" line="130"/> <source>Select icon directory</source> <translation>Выберите каталог для пиктограмм</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="16"/> + <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="17"/> <source><b>Configure icon directories</b></source> <translation><b>Настроить каталоги пиктограмм</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="36"/> + <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="37"/> <source><font color="#FF0000"><b>Note:</b> These settings are activated at the next startup of the application.</font></source> <translation><font color="#FF0000"><b>Примечание:</b> Эти изменения вступят в силу при следующем запуске приложения.</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="48"/> + <location filename="../Preferences/ConfigurationPages/IconsPage.ui" line="49"/> <source>Press to delete the selected directory from the list</source> <translation>Удалить выбранный каталог из списка</translation> </message> @@ -28059,7 +28926,7 @@ <context> <name>InterfacePage</name> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.py" line="233"/> + <location filename="../Preferences/ConfigurationPages/InterfacePage.py" line="236"/> <source>English</source> <comment>Translate this with your language</comment> <translation>Английский</translation> @@ -28137,120 +29004,120 @@ <message> <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="249"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="258"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="255"/> <source>Dockarea Corner Usage</source> <translation>Использование угла док-панели</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="264"/> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="261"/> <source>Top Left Corner</source> <translation>Левый верхний угол</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="270"/> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="267"/> <source>Select to assign the top left corner to the top dockarea</source> <translation>Выбрать левый верхний угол для верхней док-панели</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="302"/> - <source>Top dockarea</source> - <translation>Верхняя док-панель</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="280"/> - <source>Select to assign the top left corner to the left dockarea</source> - <translation>Выбрать левый верхний угол для левой док-панели</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="341"/> - <source>Left dockarea</source> - <translation>Левая док-панель</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="293"/> - <source>Top Right Corner</source> - <translation>Правый верхний угол</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="299"/> - <source>Select to assign the top right corner to the top dockarea</source> - <translation>Выбрать правый верхний угол для верхней док-панели</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="309"/> - <source>Select to assign the top right corner to the right dockarea</source> - <translation>Выбрать правый верхний угол для правой док-панели</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="370"/> - <source>Right dockarea</source> - <translation>Правая док-панель</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="322"/> - <source>Bottom Left Corner</source> - <translation>Нижний левый угол</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="328"/> - <source>Select to assign the bottom left corner to the bottom dockarea</source> - <translation>Выбрать левый нижний угол для нижней док-панели</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="360"/> - <source>Bottom dockarea</source> - <translation>Нижняя док-панель</translation> + <source>Top dockarea</source> + <translation>Верхняя док-панель</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="277"/> + <source>Select to assign the top left corner to the left dockarea</source> + <translation>Выбрать левый верхний угол для левой док-панели</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="338"/> - <source>Select to assign the bottom left corner to the left dockarea</source> - <translation>Выбрать левый нижний угол для левой док-панели</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="351"/> - <source>Bottom Right Corner</source> - <translation>Нижний правый угол</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="357"/> - <source>Select to assign the bottom right corner to the bottom dockarea</source> - <translation>Выбрать правый нижний угол для нижней док-панели</translation> + <source>Left dockarea</source> + <translation>Левая док-панель</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="290"/> + <source>Top Right Corner</source> + <translation>Правый верхний угол</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="296"/> + <source>Select to assign the top right corner to the top dockarea</source> + <translation>Выбрать правый верхний угол для верхней док-панели</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="306"/> + <source>Select to assign the top right corner to the right dockarea</source> + <translation>Выбрать правый верхний угол для правой док-панели</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="367"/> + <source>Right dockarea</source> + <translation>Правая док-панель</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="319"/> + <source>Bottom Left Corner</source> + <translation>Нижний левый угол</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="325"/> + <source>Select to assign the bottom left corner to the bottom dockarea</source> + <translation>Выбрать левый нижний угол для нижней док-панели</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="357"/> + <source>Bottom dockarea</source> + <translation>Нижняя док-панель</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="335"/> + <source>Select to assign the bottom left corner to the left dockarea</source> + <translation>Выбрать левый нижний угол для левой док-панели</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="348"/> + <source>Bottom Right Corner</source> + <translation>Нижний правый угол</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="354"/> + <source>Select to assign the bottom right corner to the bottom dockarea</source> + <translation>Выбрать правый нижний угол для нижней док-панели</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="364"/> <source>Select to assign the bottom right corner to the right dockarea</source> <translation>Выбрать правый нижний угол для правой док-панели</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="444"/> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="441"/> <source><font color="#FF0000"><b>Note:</b> All settings below are activated at the next startup of the application.</font></source> <translation><font color="#FF0000"><b>Примечание:</b> Эти изменения вступят в силу при следующем запуске приложения.</font></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="459"/> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="456"/> <source>Language:</source> <translation>Язык:</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="472"/> + <source>Select the interface language.</source> + <translation>Задайте язык интерфейса.</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="475"/> - <source>Select the interface language.</source> - <translation>Задайте язык интерфейса.</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="478"/> <source>The interface language can be selected from this list. If "system" is selected, the interface language is determined by the system. The selection of "none" means, that the default language will be used.</source> <translation>Из этого списка можно выбрать язык интерфейса. Если выбран "Системный" язык, то он автоматически определяется системой. "Никакой" озанчает, что будет использован язык по умолчанию.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="485"/> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="482"/> <source>Layout:</source> <translation>Расположение:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="498"/> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="495"/> <source>Select the layout type.</source> <translation>Выберите тип расположения.</translation> </message> @@ -28265,47 +29132,47 @@ <translation type="obsolete">Плавающие окна</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="519"/> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="516"/> <source>Shell</source> <translation>Оболочка</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="525"/> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="522"/> <source>Select to get a separate shell window</source> <translation>Отделить окно оболочки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="557"/> - <source>separate window</source> - <translation>отделить окно</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="548"/> - <source>File-Browser</source> - <translation>Просмотрщик файлов</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="554"/> + <source>separate window</source> + <translation>отделить окно</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="545"/> + <source>File-Browser</source> + <translation>Просмотрщик файлов</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="551"/> <source>Select to get a separate file browser window</source> <translation>Отделить окно просмотрщика файлов</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="618"/> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="615"/> <source>Reset layout to factory defaults</source> <translation>Вернуть расположение к значению по умолчанию</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.py" line="251"/> + <location filename="../Preferences/ConfigurationPages/InterfacePage.py" line="254"/> <source>System</source> <translation>Система</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.py" line="261"/> + <location filename="../Preferences/ConfigurationPages/InterfacePage.py" line="264"/> <source>Select style sheet file</source> <translation>Выберите файл стиля</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.py" line="261"/> + <location filename="../Preferences/ConfigurationPages/InterfacePage.py" line="264"/> <source>Qt Style Sheets (*.qss);;Cascading Style Sheets (*.css);;All files (*)</source> <translation>Стили Qt (*.qss);;Каскадные стили (*.css);;Все файлы (*)</translation> </message> @@ -28325,7 +29192,7 @@ <translation>Выберите цвет текста в stderr</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="507"/> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="504"/> <source>Toolboxes</source> <translation>Наборы иструментов</translation> </message> @@ -28335,32 +29202,32 @@ <translation><b>Настроить интерфейс</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="502"/> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="499"/> <source>Sidebars</source> <translation>Боковые панели</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="535"/> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="532"/> <source>Select to embed the shell in the Debug-Viewer</source> <translation>Встроить сомандную строку в просмотрщик отладки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="567"/> - <source>embed in Debug-Viewer</source> - <translation>встроить в просмотрщик отладки</translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="564"/> + <source>embed in Debug-Viewer</source> + <translation>встроить в просмотрщик отладки</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="561"/> <source>Select to embed the file browser in the Debug-Viewer</source> <translation>Встроить Просмотрщик файлов в Просмотрщик отладки</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="571"/> + <source>Select to embed the file browser in the Project-Viewer</source> + <translation>Встроить Просмотрщик файлов в Просмотрщик проекта</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="574"/> - <source>Select to embed the file browser in the Project-Viewer</source> - <translation>Встроить Просмотрщик файлов в Просмотрщик проекта</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="577"/> <source>embed in Project-Viewer</source> <translation>встроить в Просмотрщик проекта</translation> </message> @@ -28385,12 +29252,12 @@ <translation>Показывть при появлении новых записей</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="589"/> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="586"/> <source>Tabs</source> <translation>Закладки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="595"/> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="592"/> <source>Show only one close button instead of one for each tab</source> <translation>Показывать только одну общую закрывающую кнопку</translation> </message> @@ -28415,12 +29282,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="389"/> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="386"/> <source>Delay:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="399"/> + <location filename="../Preferences/ConfigurationPages/InterfacePage.ui" line="396"/> <source> ms</source> <translation type="unfinished">мсек</translation> </message> @@ -30394,6 +31261,210 @@ </message> </context> <context> + <name>Largefiles</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py" line="71"/> + <source>Convert Project - Converting</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py" line="82"/> + <source>Convert Project - Extracting</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py" line="131"/> + <source>Adding files to the Mercurial repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py" line="168"/> + <source>Pulling large files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py" line="197"/> + <source>Verifying the integrity of large files</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>LargefilesProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py" line="47"/> + <source>Add as Large File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py" line="52"/> + <source>Add as Normal File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py" line="61"/> + <source>Add as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py" line="66"/> + <source>Add as Normal Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectBrowserHelper.py" line="83"/> + <source>Large Files</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>LargefilesProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="33"/> + <source>Convert repository to largefiles</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="33"/> + <source>Convert repository to largefiles...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="37"/> + <source>Convert the repository of the project to a largefiles repository.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="40"/> + <source><b>Convert repository to largefiles</b><p>This converts the repository of the project to a largefiles repository. A new project is created. The current one is kept as a backup.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="50"/> + <source>Convert repository to normal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="50"/> + <source>Convert repository to normal...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="54"/> + <source>Convert the repository of the project to a normal repository.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="57"/> + <source><b>Convert repository to normal</b><p>This converts the repository of the project to a normal repository. A new project is created. The current one is kept as a backup.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="67"/> + <source>Pull Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="72"/> + <source>Pull large files from a remote repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="75"/> + <source><b>Pull Large Files</b><p>This pulls missing large files from a remote repository into the local repository.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="83"/> + <source>Show Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="83"/> + <source>Show summary...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="88"/> + <source>Show summary information of the working directory status</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="91"/> + <source><b>Show summary</b><p>This shows some summary information of the working directory status.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="99"/> + <source>Verify large files of current revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="99"/> + <source>Verify large files of current revision...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="103"/> + <source>Verify that all large files in the current revision exist</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="106"/> + <source><b>Verify large files of current revision</b><p>This verifies that all large files in the current revision exist.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="115"/> + <source>Verify large files of all revision</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="115"/> + <source>Verify large files of all revision...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="119"/> + <source>Verify that all large files in all revisions exist</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="122"/> + <source><b>Verify large files of all revision</b><p>This verifies that all large files in all revisions exist.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="131"/> + <source>Verify large files contents</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="131"/> + <source>Verify large files contents...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="135"/> + <source>Verify the contents of all large files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="138"/> + <source><b>Verify large files contents</b><p>This verifies the contents of all large files.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="156"/> + <source>Administration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/ProjectHelper.py" line="179"/> + <source>Large Files</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>LexerAssociationDialog</name> <message> <location filename="../Project/LexerAssociationDialog.ui" line="13"/> @@ -31233,59 +32304,130 @@ </message> </context> <context> + <name>LfConvertDataDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.ui" line="14"/> + <source>Convert Repository Format</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.ui" line="26"/> + <source>New project directory:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.ui" line="33"/> + <source>Enter the directory name of the new project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.ui" line="40"/> + <source>Press to select the new project directory name via a directory selection dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.ui" line="47"/> + <source>Minimum file size:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.ui" line="54"/> + <source>Enter the minimum file size in MB for files to be treated as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.ui" line="60"/> + <source> MB</source> + <translation type="unfinished">MB</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.ui" line="86"/> + <source>Patterns:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.ui" line="93"/> + <source>Enter file patterns (space separated) for files to be treated as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfConvertDataDialog.py" line="76"/> + <source>New Project Directory</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>LfRevisionsInputDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfRevisionsInputDialog.ui" line="14"/> + <source>Revisions Input</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfRevisionsInputDialog.ui" line="23"/> + <source>Enter revisions to pull large files for (one per line):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/LfRevisionsInputDialog.ui" line="33"/> + <source>Enter changesets by number, id, range or revset expression one per line</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>Listspace</name> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="387"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="386"/> <source>Untitled {0}</source> <translation>Без имени {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="228"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="227"/> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="235"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="234"/> <source>Close All</source> <translation>Закрыть всё</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="238"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="237"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="241"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="240"/> <source>Save As...</source> <translation>Сохранить как...</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="244"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="243"/> <source>Save All</source> <translation>Сохранить всё</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="252"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="251"/> <source>Print</source> <translation>Печать</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="508"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="507"/> <source>{0} (ro)</source> <translation>{0} (только чтение)</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="248"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="247"/> <source>Open 'rejection' file</source> <translation>Открыть 'отбракованный' файл</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="256"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="255"/> <source>Copy Path to Clipboard</source> <translation>Сопировать путь в буфер обмена</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="231"/> + <location filename="../Plugins/ViewManagerPlugins/Listspace/Listspace.py" line="230"/> <source>Close Others</source> <translation>Закрыть остальные</translation> </message> @@ -31560,32 +32702,32 @@ <translation><b>Настроить интерфейс Mercurial</b></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="37"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="93"/> <source>Log</source> <translation>Журнал</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="43"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="99"/> <source>No. of log messages shown:</source> <translation>Количество показанных сообщений:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="50"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="106"/> <source>Enter the number of log messages to be shown</source> <translation>Задайте количество сообщений журнала для отображения</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="79"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="135"/> <source>Commit</source> <translation>Зафиксировать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="85"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="141"/> <source>No. of commit messages to remember:</source> <translation>Количество запоминаемых комментариев к фиксациям:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="148"/> <source>Enter the number of commit messages to remember</source> <translation>Задайте количество комментариев к фиксациям, которое необходимо помнить</translation> </message> @@ -31600,118 +32742,154 @@ <translation type="obsolete">Править файл конфигурации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="124"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="180"/> <source>Incoming / Outgoing</source> <translation>Входящие/Выходящие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="130"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="186"/> <source>Select to show the incoming and outgoing log in a log browser dialog</source> <translation>Показывать входящий и выходящий журнал в специальном диалоге</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="133"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="189"/> <source>Use Log Browser for incoming / outgoing log</source> <translation>Показывать входящий и выходящий журнал в специальном диалоге</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="143"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="199"/> <source>Pull</source> <translation>Загрузить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="149"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="205"/> <source>Select to update the working directory to new tip</source> <translation>Обновлять рабочий каталог</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="152"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="208"/> <source>Update after pulling</source> <translation>Обновлять рабочий каталог после загрузки</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="297"/> + <source>Edit the Mercurial configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="300"/> + <source>Edit configuration file</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="274"/> + <source>Cleanup</source> + <translation>Очистка</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="280"/> + <source>Pattern:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="287"/> + <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="215"/> + <source>Select to prefer unbundle over pull</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="218"/> - <source>Edit the Mercurial configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="221"/> - <source>Edit configuration file</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="195"/> - <source>Cleanup</source> - <translation>Очистка</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="201"/> - <source>Pattern:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="208"/> - <source>Enter the file name patterns to be used for cleaning up (entries separated by a space character)</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="159"/> - <source>Select to prefer unbundle over pull</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="162"/> <source><b>Prefer Unbundle</b> <p>If this option is selected, it will be checked, if a Mercurial changegroups file from a previous "Show Incoming" request exists. In this case it will be applied and deleted. Otherwise a pull request will be sent.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="166"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="222"/> <source>Prefer Unbundle</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="176"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="255"/> <source>Revert</source> <translation>Откатить</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="261"/> <source>Select to create a backup file (.orig) before reverting changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="185"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="264"/> <source>Create Backup Files</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="232"/> + <source>Merge</source> + <translation type="unfinished">Слить</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="238"/> + <source>Select to enforce usage of the Mercural internal merge tool</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="241"/> + <source><b>Internal Merge Tool</b> +<p>Select to enforce usage of the Mercural internal merge tool,which leaves conflict markers in the file in case of conflicting changes.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="245"/> + <source>Use internal merge with conflict markers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="37"/> + <source>Global Options</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="43"/> + <source>Encoding:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="56"/> + <source>Select the encoding to be used by Mercurial</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="63"/> + <source>Encoding Mode:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="76"/> + <source>Select the encoding mode</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui" line="83"/> + <source>Consider hidden changesets</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MercurialUserDataDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="14"/> - <source>Mercurial User Data</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="23"/> <source>&Username:</source> - <translation type="unfinished">&Имя пользователя:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="33"/> - <source>Enter the name of the user (first name and last name)</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Имя пользователя:</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="40"/> <source>&Email:</source> - <translation type="unfinished">&Email:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialUserDataDialog.ui" line="50"/> - <source>Enter the email address</source> - <translation type="unfinished"></translation> + <translation type="obsolete">&Email:</translation> </message> </context> <context> @@ -32009,626 +33187,626 @@ <context> <name>MiniEditor</name> <message> - <location filename="../QScintilla/MiniEditor.py" line="371"/> + <location filename="../QScintilla/MiniEditor.py" line="370"/> <source>New</source> <translation>Новый</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="371"/> + <location filename="../QScintilla/MiniEditor.py" line="370"/> <source>&New</source> <translation>&Новый</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="371"/> + <location filename="../QScintilla/MiniEditor.py" line="370"/> <source>Ctrl+N</source> <comment>File|New</comment> <translation>Ctrl+N</translation> </message> <message> + <location filename="../QScintilla/MiniEditor.py" line="376"/> + <source>Open an empty editor window</source> + <translation>Открыть пустое окно редактора</translation> + </message> + <message> <location filename="../QScintilla/MiniEditor.py" line="377"/> - <source>Open an empty editor window</source> - <translation>Открыть пустое окно редактора</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="378"/> <source><b>New</b><p>An empty editor window will be created.</p></source> <translation><b>Новый документ</b> <p>Будет создано пустое окно редактора.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="385"/> + <location filename="../QScintilla/MiniEditor.py" line="384"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="385"/> + <location filename="../QScintilla/MiniEditor.py" line="384"/> <source>&Open...</source> <translation>&Открыть...</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="385"/> + <location filename="../QScintilla/MiniEditor.py" line="384"/> <source>Ctrl+O</source> <comment>File|Open</comment> <translation>Ctrl+O</translation> </message> <message> + <location filename="../QScintilla/MiniEditor.py" line="390"/> + <source>Open a file</source> + <translation>Открыть файл</translation> + </message> + <message> <location filename="../QScintilla/MiniEditor.py" line="391"/> - <source>Open a file</source> - <translation>Открыть файл</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="392"/> <source><b>Open a file</b><p>You will be asked for the name of a file to be opened.</p></source> <translation><b>Открыть файл</b><p>У вас запросят имя файла, который нужно открыть.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="399"/> + <location filename="../QScintilla/MiniEditor.py" line="398"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="399"/> + <location filename="../QScintilla/MiniEditor.py" line="398"/> <source>&Save</source> <translation>&Сохранить</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="399"/> + <location filename="../QScintilla/MiniEditor.py" line="398"/> <source>Ctrl+S</source> <comment>File|Save</comment> <translation>Ctrl+S</translation> </message> <message> + <location filename="../QScintilla/MiniEditor.py" line="404"/> + <source>Save the current file</source> + <translation>Сохранить текущий файл</translation> + </message> + <message> <location filename="../QScintilla/MiniEditor.py" line="405"/> - <source>Save the current file</source> - <translation>Сохранить текущий файл</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="406"/> <source><b>Save File</b><p>Save the contents of current editor window.</p></source> <translation><b>Сохранить файл</b> <p>Сохранить содержимое текущего окна редактора.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="413"/> + <location filename="../QScintilla/MiniEditor.py" line="412"/> <source>Save as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="413"/> + <location filename="../QScintilla/MiniEditor.py" line="412"/> <source>Save &as...</source> <translation>Сохранить &как...</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="413"/> + <location filename="../QScintilla/MiniEditor.py" line="412"/> <source>Shift+Ctrl+S</source> <comment>File|Save As</comment> <translation>Shift+Ctrl+S</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="419"/> + <location filename="../QScintilla/MiniEditor.py" line="418"/> <source>Save the current file to a new one</source> <translation>Сохранить текущий файл в новый</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="421"/> + <location filename="../QScintilla/MiniEditor.py" line="420"/> <source><b>Save File as</b><p>Save the contents of current editor window to a new file. The file can be entered in a file selection dialog.</p></source> <translation><b>Сохранить как</b> <p>Сохранить содержимое текущего редактора в новый файл. Имя файла я спрошу с помощью файлового диалога.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="429"/> + <location filename="../QScintilla/MiniEditor.py" line="428"/> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="429"/> + <location filename="../QScintilla/MiniEditor.py" line="428"/> <source>&Close</source> <translation>&Закрыть</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="429"/> + <location filename="../QScintilla/MiniEditor.py" line="428"/> <source>Ctrl+W</source> <comment>File|Close</comment> <translation>Ctrl+W</translation> </message> <message> + <location filename="../QScintilla/MiniEditor.py" line="434"/> + <source>Close the editor window</source> + <translation>Закрыть окно редактора</translation> + </message> + <message> <location filename="../QScintilla/MiniEditor.py" line="435"/> - <source>Close the editor window</source> - <translation>Закрыть окно редактора</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="436"/> <source><b>Close Window</b><p>Close the current window.</p></source> <translation><b>Закрыть окно</b> <p>Закрыть текущее окно.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="475"/> + <location filename="../QScintilla/MiniEditor.py" line="474"/> <source>Undo</source> <translation>Отмена</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="475"/> + <location filename="../QScintilla/MiniEditor.py" line="474"/> <source>&Undo</source> <translation>&Отмена</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="475"/> + <location filename="../QScintilla/MiniEditor.py" line="474"/> <source>Ctrl+Z</source> <comment>Edit|Undo</comment> <translation>Ctrl+Z</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="475"/> + <location filename="../QScintilla/MiniEditor.py" line="474"/> <source>Alt+Backspace</source> <comment>Edit|Undo</comment> <translation>Alt+Backspace</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="482"/> + <location filename="../QScintilla/MiniEditor.py" line="481"/> <source>Undo the last change</source> <translation>Отменить последнее изменение</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="483"/> + <location filename="../QScintilla/MiniEditor.py" line="482"/> <source><b>Undo</b><p>Undo the last change done in the current editor.</p></source> <translation><b>Отмена</b> <p>Отменить последнее изменение в текущем редакторе.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="490"/> + <location filename="../QScintilla/MiniEditor.py" line="489"/> <source>Redo</source> <translation>Повтор</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="490"/> + <location filename="../QScintilla/MiniEditor.py" line="489"/> <source>&Redo</source> <translation>&Повтор</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="490"/> + <location filename="../QScintilla/MiniEditor.py" line="489"/> <source>Ctrl+Shift+Z</source> <comment>Edit|Redo</comment> <translation>Ctrl+Shift+Z</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="496"/> + <location filename="../QScintilla/MiniEditor.py" line="495"/> <source>Redo the last change</source> <translation>Восстановить последнее отменённое изменение</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="497"/> + <location filename="../QScintilla/MiniEditor.py" line="496"/> <source><b>Redo</b><p>Redo the last change done in the current editor.</p></source> <translation><b>Повтор</b> <p>Восстановить последнее отменённое изменение.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="504"/> + <location filename="../QScintilla/MiniEditor.py" line="503"/> <source>Cut</source> <translation>Вырезать</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="504"/> + <location filename="../QScintilla/MiniEditor.py" line="503"/> <source>Cu&t</source> <translation>В&ырезать</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="504"/> + <location filename="../QScintilla/MiniEditor.py" line="503"/> <source>Ctrl+X</source> <comment>Edit|Cut</comment> <translation>Ctrl+X</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="504"/> + <location filename="../QScintilla/MiniEditor.py" line="503"/> <source>Shift+Del</source> <comment>Edit|Cut</comment> <translation>Shift+Del</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="511"/> + <location filename="../QScintilla/MiniEditor.py" line="510"/> <source>Cut the selection</source> <translation>Вырезать выделение</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="512"/> + <location filename="../QScintilla/MiniEditor.py" line="511"/> <source><b>Cut</b><p>Cut the selected text of the current editor to the clipboard.</p></source> <translation><b>Вырезать</b> <p>Вырезать выделение и поместить его в буфер обмена.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="520"/> + <location filename="../QScintilla/MiniEditor.py" line="519"/> <source>Copy</source> <translation>Копировать</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="520"/> + <location filename="../QScintilla/MiniEditor.py" line="519"/> <source>&Copy</source> <translation>&Копировать</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="520"/> + <location filename="../QScintilla/MiniEditor.py" line="519"/> <source>Ctrl+C</source> <comment>Edit|Copy</comment> <translation>Ctrl+C</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="520"/> + <location filename="../QScintilla/MiniEditor.py" line="519"/> <source>Ctrl+Ins</source> <comment>Edit|Copy</comment> <translation>Ctrl+Ins</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="527"/> + <location filename="../QScintilla/MiniEditor.py" line="526"/> <source>Copy the selection</source> <translation>Копировать выделение</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="528"/> + <location filename="../QScintilla/MiniEditor.py" line="527"/> <source><b>Copy</b><p>Copy the selected text of the current editor to the clipboard.</p></source> <translation><b>Копировать</b> <p>Копировать выделение и поместить его в буфер обмена.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="536"/> + <location filename="../QScintilla/MiniEditor.py" line="535"/> <source>Paste</source> <translation>Вставить</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="536"/> + <location filename="../QScintilla/MiniEditor.py" line="535"/> <source>&Paste</source> <translation>Вс&тавить</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="536"/> + <location filename="../QScintilla/MiniEditor.py" line="535"/> <source>Ctrl+V</source> <comment>Edit|Paste</comment> <translation>Ctrl+V</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="536"/> + <location filename="../QScintilla/MiniEditor.py" line="535"/> <source>Shift+Ins</source> <comment>Edit|Paste</comment> <translation>Shift+Ins</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="543"/> + <location filename="../QScintilla/MiniEditor.py" line="542"/> <source>Paste the last cut/copied text</source> <translation>Вставить вырезанный/скопированный текст</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="545"/> + <location filename="../QScintilla/MiniEditor.py" line="544"/> <source><b>Paste</b><p>Paste the last cut/copied text from the clipboard to the current editor.</p></source> <translation><b>Вставить</b> <p>Вставить текст из буфера обмена в текущую позицию редактора.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="553"/> + <location filename="../QScintilla/MiniEditor.py" line="552"/> <source>Clear</source> <translation>Очистить</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="553"/> + <location filename="../QScintilla/MiniEditor.py" line="552"/> <source>Cl&ear</source> <translation>О&чистить</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="553"/> + <location filename="../QScintilla/MiniEditor.py" line="552"/> <source>Alt+Shift+C</source> <comment>Edit|Clear</comment> <translation>Alt+Shift+C</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="560"/> + <location filename="../QScintilla/MiniEditor.py" line="559"/> <source>Clear all text</source> <translation>Убрать весь текст</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="561"/> + <location filename="../QScintilla/MiniEditor.py" line="560"/> <source><b>Clear</b><p>Delete all text of the current editor.</p></source> <translation><b>Очистить</b> <p>Удалить весь текст из текущего редактора.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1964"/> + <location filename="../QScintilla/MiniEditor.py" line="1963"/> <source>About</source> <translation>О</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1964"/> + <location filename="../QScintilla/MiniEditor.py" line="1963"/> <source>&About</source> <translation>&О</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1968"/> + <location filename="../QScintilla/MiniEditor.py" line="1967"/> <source>Display information about this software</source> <translation>Информация о ПО</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1970"/> + <location filename="../QScintilla/MiniEditor.py" line="1969"/> <source><b>About</b><p>Display some information about this software.</p></source> <translation><b>О...</b><p>Информация об этом программном продукте.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1976"/> + <location filename="../QScintilla/MiniEditor.py" line="1975"/> <source>About Qt</source> <translation>О Qt</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1976"/> + <location filename="../QScintilla/MiniEditor.py" line="1975"/> <source>About &Qt</source> <translation>О &Qt</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1980"/> + <location filename="../QScintilla/MiniEditor.py" line="1979"/> <source>Display information about the Qt toolkit</source> <translation>Информация о библиотеке Qt</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1982"/> + <location filename="../QScintilla/MiniEditor.py" line="1981"/> <source><b>About Qt</b><p>Display some information about the Qt toolkit.</p></source> <translation><b>О Qt</b><p>Информация о библиотеке Qt.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2012"/> + <location filename="../QScintilla/MiniEditor.py" line="2011"/> <source>&File</source> <translation>&Файл</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2023"/> + <location filename="../QScintilla/MiniEditor.py" line="2022"/> <source>&Edit</source> <translation>&Правка</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2040"/> + <location filename="../QScintilla/MiniEditor.py" line="2039"/> <source>&Help</source> <translation>&Помощь</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2101"/> + <location filename="../QScintilla/MiniEditor.py" line="2100"/> <source><p>This part of the status bar displays the line number of the editor.</p></source> <translation><p>Эта часть строки статуса показывает номер текущей строки редактора.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2108"/> + <location filename="../QScintilla/MiniEditor.py" line="2107"/> <source><p>This part of the status bar displays the cursor position of the editor.</p></source> <translation><p>Эта часть строки статуса показывает текущую позицию курсора в редакторе.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2113"/> + <location filename="../QScintilla/MiniEditor.py" line="2112"/> <source>Ready</source> <translation>Готово</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2182"/> + <location filename="../QScintilla/MiniEditor.py" line="2181"/> <source>File loaded</source> <translation>Файл загружен</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2528"/> + <location filename="../QScintilla/MiniEditor.py" line="2527"/> <source>Untitled</source> <translation>Без имени</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2231"/> + <location filename="../QScintilla/MiniEditor.py" line="2230"/> <source>{0}[*] - {1}</source> <translation>{0}[*] - {1}</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2231"/> + <location filename="../QScintilla/MiniEditor.py" line="2230"/> <source>Mini Editor</source> <translation>Мини-редактор</translation> </message> <message> + <location filename="../QScintilla/MiniEditor.py" line="2568"/> + <source>Select all</source> + <translation>Выбрать всё</translation> + </message> + <message> <location filename="../QScintilla/MiniEditor.py" line="2569"/> - <source>Select all</source> - <translation>Выбрать всё</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2570"/> <source>Deselect all</source> <translation>Снять выделение</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2584"/> + <location filename="../QScintilla/MiniEditor.py" line="2583"/> <source>Languages</source> <translation>Языки</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2587"/> + <location filename="../QScintilla/MiniEditor.py" line="2586"/> <source>No Language</source> <translation>Нет языка</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2161"/> + <location filename="../QScintilla/MiniEditor.py" line="2160"/> <source>Open File</source> <translation>Открыть файл</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2212"/> + <location filename="../QScintilla/MiniEditor.py" line="2211"/> <source>File saved</source> <translation>Файл сохранён</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2094"/> + <location filename="../QScintilla/MiniEditor.py" line="2093"/> <source><p>This part of the status bar displays an indication of the editors files writability.</p></source> <translation><p>Эта часть строки статуса указывает на возможность записи файла, открытого в редакторе.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1989"/> + <location filename="../QScintilla/MiniEditor.py" line="1988"/> <source>What's This?</source> <translation>Что это?</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1989"/> + <location filename="../QScintilla/MiniEditor.py" line="1988"/> <source>&What's This?</source> <translation>&Что это?</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1989"/> + <location filename="../QScintilla/MiniEditor.py" line="1988"/> <source>Shift+F1</source> <comment>Help|What's This?'</comment> <translation>Shift+F1</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1995"/> + <location filename="../QScintilla/MiniEditor.py" line="1994"/> <source>Context sensitive help</source> <translation>Контекстная помощь</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1996"/> + <location filename="../QScintilla/MiniEditor.py" line="1995"/> <source><b>Display context sensitive help</b><p>In What's This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.</p></source> <translation><b>Показать контекстную помощь</b> <p>В режиме контекстной помощи курсор мыши выглядит как стрелка со знаком вопроса, и, щёлкнув по элементу интерфейса, Вы можете просмотреть краткую помощь о его роли и его использовании. В диалогах можно воспользоваться кнопкой контекстной помощи в заголовке окна.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2052"/> + <location filename="../QScintilla/MiniEditor.py" line="2051"/> <source>File</source> <translation>Файл</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2064"/> + <location filename="../QScintilla/MiniEditor.py" line="2063"/> <source>Edit</source> <translation>Редактировать</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2074"/> + <location filename="../QScintilla/MiniEditor.py" line="2073"/> <source>Find</source> <translation>Найти</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2081"/> + <location filename="../QScintilla/MiniEditor.py" line="2080"/> <source>Help</source> <translation>Помощь</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="443"/> + <location filename="../QScintilla/MiniEditor.py" line="442"/> <source>Print</source> <translation>Печать</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="443"/> + <location filename="../QScintilla/MiniEditor.py" line="442"/> <source>&Print</source> <translation>&Печать</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="443"/> + <location filename="../QScintilla/MiniEditor.py" line="442"/> <source>Ctrl+P</source> <comment>File|Print</comment> <translation>Ctrl+P</translation> </message> <message> + <location filename="../QScintilla/MiniEditor.py" line="448"/> + <source>Print the current file</source> + <translation>Распечатать текущий файл</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2491"/> + <source>Printing...</source> + <translation>Печать...</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2508"/> + <source>Printing completed</source> + <translation>Печать завершена</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2510"/> + <source>Error while printing</source> + <translation>Ошибка печати</translation> + </message> + <message> + <location filename="../QScintilla/MiniEditor.py" line="2513"/> + <source>Printing aborted</source> + <translation>Печать отменена</translation> + </message> + <message> <location filename="../QScintilla/MiniEditor.py" line="449"/> - <source>Print the current file</source> - <translation>Распечатать текущий файл</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2492"/> - <source>Printing...</source> - <translation>Печать...</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2509"/> - <source>Printing completed</source> - <translation>Печать завершена</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2511"/> - <source>Error while printing</source> - <translation>Ошибка печати</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="2514"/> - <source>Printing aborted</source> - <translation>Печать отменена</translation> - </message> - <message> - <location filename="../QScintilla/MiniEditor.py" line="450"/> <source><b>Print File</b><p>Print the contents of the current file.</p></source> <translation><b>Печать</b><p>Распечатать содержимое текущего файла.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="457"/> + <location filename="../QScintilla/MiniEditor.py" line="456"/> <source>Print Preview</source> <translation>Предварительный просмотр печати</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="462"/> + <location filename="../QScintilla/MiniEditor.py" line="461"/> <source>Print preview of the current file</source> <translation>Предварительный просмотр печати текущего файла</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="464"/> + <location filename="../QScintilla/MiniEditor.py" line="463"/> <source><b>Print Preview</b><p>Print preview of the current file.</p></source> <translation><b>Предварительный просмотр печати</b><p>Предварительный просмотр печати текущего файла.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2610"/> + <location filename="../QScintilla/MiniEditor.py" line="2609"/> <source>Guessed</source> <translation>Догадки</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2631"/> + <location filename="../QScintilla/MiniEditor.py" line="2630"/> <source>Alternatives</source> <translation>Альтернативы</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2628"/> + <location filename="../QScintilla/MiniEditor.py" line="2627"/> <source>Alternatives ({0})</source> <translation>Альтернативы ({0})</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2645"/> + <location filename="../QScintilla/MiniEditor.py" line="2644"/> <source>Pygments Lexer</source> <translation>Pygments лексер</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2645"/> + <location filename="../QScintilla/MiniEditor.py" line="2644"/> <source>Select the Pygments lexer to apply.</source> <translation>Задайте язык лексического анализатора.</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="253"/> + <location filename="../QScintilla/MiniEditor.py" line="252"/> <source>About eric5 Mini Editor</source> <translation>О мини-редакторе eric5</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="253"/> + <location filename="../QScintilla/MiniEditor.py" line="252"/> <source>The eric5 Mini Editor is an editor component based on QScintilla. It may be used for simple editing tasks, that don't need the power of a full blown editor.</source> <translation>Мини-редактор eric5 — это компонент, основанный на QScintilla. Его можно использовать для простых задач редактирования, не требующих полномасштабного редактора.</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="317"/> + <location filename="../QScintilla/MiniEditor.py" line="316"/> <source>Line: {0:5}</source> <translation>Строка: {0:5}</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="322"/> + <location filename="../QScintilla/MiniEditor.py" line="321"/> <source>Pos: {0:5}</source> <translation>Позиция: {0:5}</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2140"/> + <location filename="../QScintilla/MiniEditor.py" line="2139"/> <source>eric5 Mini Editor</source> <translation>Мини-редактор eric5</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2161"/> + <location filename="../QScintilla/MiniEditor.py" line="2160"/> <source><p>The file <b>{0}</b> could not be opened.</p><p>Reason: {1}</p></source> <translation><p>Невозможно прочитать файл <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2197"/> + <location filename="../QScintilla/MiniEditor.py" line="2196"/> <source>Save File</source> <translation>Сохранить файл</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2197"/> + <location filename="../QScintilla/MiniEditor.py" line="2196"/> <source><p>The file <b>{0}</b> could not be saved.<br/>Reason: {1}</p></source> <translation><p>Невозможно сохранить файл <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="2140"/> + <location filename="../QScintilla/MiniEditor.py" line="2139"/> <source>The document has unsaved changes.</source> <translation>Изменения в текущем документе не сохранены.</translation> </message> @@ -32636,238 +33814,253 @@ <context> <name>MultiProject</name> <message> - <location filename="../MultiProject/MultiProject.py" line="495"/> + <location filename="../MultiProject/MultiProject.py" line="530"/> <source>Save File</source> <translation>Сохранить файл</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="574"/> + <location filename="../MultiProject/MultiProject.py" line="609"/> <source>&New...</source> <translation>&Новый...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="588"/> + <location filename="../MultiProject/MultiProject.py" line="623"/> <source>&Open...</source> <translation>&Открыть...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="601"/> + <location filename="../MultiProject/MultiProject.py" line="636"/> <source>&Close</source> <translation>&Закрыть</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="614"/> + <location filename="../MultiProject/MultiProject.py" line="649"/> <source>&Save</source> <translation>&Сохранить</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="626"/> + <location filename="../MultiProject/MultiProject.py" line="661"/> <source>Save &as...</source> <translation>Сохранить &как...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="640"/> + <location filename="../MultiProject/MultiProject.py" line="675"/> <source>Add &project...</source> <translation>Добавить &проект...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="655"/> + <location filename="../MultiProject/MultiProject.py" line="690"/> <source>&Properties...</source> <translation>&Свойства...</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="682"/> + <location filename="../MultiProject/MultiProject.py" line="717"/> <source>&Multiproject</source> <translation>&Мултипроект</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="683"/> + <location filename="../MultiProject/MultiProject.py" line="718"/> <source>Open &Recent Multiprojects</source> <translation>Открыть &недавние мултипроекты</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="724"/> + <location filename="../MultiProject/MultiProject.py" line="759"/> <source>Multiproject</source> <translation>Мултипроект</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="783"/> + <location filename="../MultiProject/MultiProject.py" line="818"/> <source>&Clear</source> <translation>&Очистить</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="209"/> + <location filename="../MultiProject/MultiProject.py" line="229"/> <source>Read multiproject file</source> <translation>Загрузить файл мултипроекта</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="209"/> + <location filename="../MultiProject/MultiProject.py" line="229"/> <source><p>The multiproject file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл мултипроекта: <b>{0}</b></p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="252"/> + <location filename="../MultiProject/MultiProject.py" line="274"/> <source>Save multiproject file</source> <translation>Сохранить файл мултипроекта</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="252"/> + <location filename="../MultiProject/MultiProject.py" line="274"/> <source><p>The multiproject file <b>{0}</b> could not be written.</p></source> <translation><p>Невозможно сохранить файл мултипроекта: <b>{0}</b></p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="588"/> + <location filename="../MultiProject/MultiProject.py" line="623"/> <source>Open multiproject</source> <translation>Открыть мултипроект</translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="480"/> <source>Multiproject Files (*.e4m)</source> - <translation>Файлы мултипроектов (*.e4m)</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="626"/> + <translation type="obsolete">Файлы мултипроектов (*.e4m)</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="661"/> <source>Save multiproject as</source> <translation>Сохранить файл мултипроекта как</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="520"/> + <location filename="../MultiProject/MultiProject.py" line="555"/> <source>Close Multiproject</source> <translation>Закрыть мултипроект</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="520"/> + <location filename="../MultiProject/MultiProject.py" line="555"/> <source>The current multiproject has unsaved changes.</source> <translation>Изменения в текущем мултипроекте не сохранены.</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="574"/> + <location filename="../MultiProject/MultiProject.py" line="609"/> <source>New multiproject</source> <translation>Новый мултипроект</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="579"/> - <source>Generate a new multiproject</source> - <translation>Создать новый мултипроект</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="580"/> - <source><b>New...</b><p>This opens a dialog for entering the info for a new multiproject.</p></source> - <translation><b>Новый...</b><p>Открыть диалог для ввода информации о новом мултипроекте.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="593"/> - <source>Open an existing multiproject</source> - <translation>Открыть существующий мултипроект</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="594"/> - <source><b>Open...</b><p>This opens an existing multiproject.</p></source> - <translation><b>Открыть...</b><p>Открыть существующий мултипроект.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="601"/> - <source>Close multiproject</source> - <translation>Закрыть мултипроект</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="605"/> - <source>Close the current multiproject</source> - <translation>Закрыть текущий мултипроект</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="607"/> - <source><b>Close</b><p>This closes the current multiproject.</p></source> - <translation><b>Закрыть</b><p>Закрыть текущий мултипроект.</p></translation> - </message> - <message> <location filename="../MultiProject/MultiProject.py" line="614"/> - <source>Save multiproject</source> - <translation>Сохранить файл мултипроекта</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="618"/> - <source>Save the current multiproject</source> - <translation>Закрыть текущий мултипроект</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="619"/> - <source><b>Save</b><p>This saves the current multiproject.</p></source> - <translation><b>Закрыть</b><p>Закрыть текущий мултипроект.</p></translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="631"/> - <source>Save the current multiproject to a new file</source> - <translation>Сохранить текущий мултипроект в новый файл</translation> - </message> - <message> - <location filename="../MultiProject/MultiProject.py" line="633"/> - <source><b>Save as</b><p>This saves the current multiproject to a new file.</p></source> - <translation><b>Сохранить как</b><p> Сохранить текущий мултипроект в новый файл.</p></translation> + <source>Generate a new multiproject</source> + <translation>Создать новый мултипроект</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="615"/> + <source><b>New...</b><p>This opens a dialog for entering the info for a new multiproject.</p></source> + <translation><b>Новый...</b><p>Открыть диалог для ввода информации о новом мултипроекте.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="628"/> + <source>Open an existing multiproject</source> + <translation>Открыть существующий мултипроект</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="629"/> + <source><b>Open...</b><p>This opens an existing multiproject.</p></source> + <translation><b>Открыть...</b><p>Открыть существующий мултипроект.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="636"/> + <source>Close multiproject</source> + <translation>Закрыть мултипроект</translation> </message> <message> <location filename="../MultiProject/MultiProject.py" line="640"/> + <source>Close the current multiproject</source> + <translation>Закрыть текущий мултипроект</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="642"/> + <source><b>Close</b><p>This closes the current multiproject.</p></source> + <translation><b>Закрыть</b><p>Закрыть текущий мултипроект.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="649"/> + <source>Save multiproject</source> + <translation>Сохранить файл мултипроекта</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="653"/> + <source>Save the current multiproject</source> + <translation>Закрыть текущий мултипроект</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="654"/> + <source><b>Save</b><p>This saves the current multiproject.</p></source> + <translation><b>Закрыть</b><p>Закрыть текущий мултипроект.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="666"/> + <source>Save the current multiproject to a new file</source> + <translation>Сохранить текущий мултипроект в новый файл</translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="668"/> + <source><b>Save as</b><p>This saves the current multiproject to a new file.</p></source> + <translation><b>Сохранить как</b><p> Сохранить текущий мултипроект в новый файл.</p></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="675"/> <source>Add project to multiproject</source> <translation>Добавить проект в мултипроект</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="645"/> + <location filename="../MultiProject/MultiProject.py" line="680"/> <source>Add a project to the current multiproject</source> <translation>Добавить проект в текущий мултипроект</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="647"/> + <location filename="../MultiProject/MultiProject.py" line="682"/> <source><b>Add project...</b><p>This opens a dialog for adding a project to the current multiproject.</p></source> <translation><b>Добавить проект...</b><p>Открыть диалог для добавления проект в текущий мултипроект.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="655"/> + <location filename="../MultiProject/MultiProject.py" line="690"/> <source>Multiproject properties</source> <translation>Свойства мултипроекта</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="660"/> + <location filename="../MultiProject/MultiProject.py" line="695"/> <source>Show the multiproject properties</source> <translation>Свойства мултипроекта</translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="662"/> + <location filename="../MultiProject/MultiProject.py" line="697"/> <source><b>Properties...</b><p>This shows a dialog to edit the multiproject properties.</p></source> <translation><b>Свойства...</b><p>Показать диалог для редактирования свойств мултипроекта.</p></translation> </message> <message> - <location filename="../MultiProject/MultiProject.py" line="495"/> + <location filename="../MultiProject/MultiProject.py" line="530"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже сущеструет. Переписать?</p></translation> </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="451"/> + <source>Multiproject Files (*.e5m *.e4m)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../MultiProject/MultiProject.py" line="515"/> + <source>Multiproject Files (*.e5m)</source> + <translation type="unfinished">Файлы мултипроектов (*.e4m) {5m?}</translation> + </message> </context> <context> <name>MultiProjectBrowser</name> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="248"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="290"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="249"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="291"/> <source>Remove</source> <translation>Удалить</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="250"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="292"/> <source>Properties</source> <translation>Свойства</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="262"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="304"/> <source>Configure...</source> <translation>Настроить...</translation> </message> <message> - <location filename="../MultiProject/MultiProjectBrowser.py" line="259"/> + <location filename="../MultiProject/MultiProjectBrowser.py" line="301"/> <source>Add Project...</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../MultiProject/MultiProjectBrowser.py" line="206"/> + <source>Not categorized</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>MultiProjectPage</name> @@ -32877,47 +34070,47 @@ <translation><b>Настроить мултипроект</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/MultiProjectPage.ui" line="67"/> + <location filename="../Preferences/ConfigurationPages/MultiProjectPage.ui" line="64"/> <source>Master Project</source> <translation>Главный проект</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/MultiProjectPage.ui" line="76"/> + <location filename="../Preferences/ConfigurationPages/MultiProjectPage.ui" line="73"/> <source>Open master project automatically</source> <translation>Открывать главный проект автоматически</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/MultiProjectPage.ui" line="86"/> + <location filename="../Preferences/ConfigurationPages/MultiProjectPage.ui" line="83"/> <source>XML</source> <translation>XML</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/MultiProjectPage.ui" line="89"/> + <source>Select, if a timestamp should be written to all multiproject related XML files</source> + <translation>Включать время в XML файлы, относящиеся к проекту</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/MultiProjectPage.ui" line="92"/> - <source>Select, if a timestamp should be written to all multiproject related XML files</source> - <translation>Включать время в XML файлы, относящиеся к проекту</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/MultiProjectPage.ui" line="95"/> <source>Include timestamp in multiproject related XML files</source> <translation>Включать время в XML файлы, относящиеся к проекту</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/MultiProjectPage.ui" line="105"/> + <location filename="../Preferences/ConfigurationPages/MultiProjectPage.ui" line="102"/> <source>Recent Multiprojects</source> <translation>Недавние мултипроекты</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/MultiProjectPage.ui" line="120"/> + <location filename="../Preferences/ConfigurationPages/MultiProjectPage.ui" line="117"/> <source>Enter the number of recent multiprojects to remember</source> <translation>Сколько недавних проектов запоминать</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/MultiProjectPage.ui" line="73"/> + <location filename="../Preferences/ConfigurationPages/MultiProjectPage.ui" line="70"/> <source>Select to open the master project automatically upon opening the multiproject</source> <translation>Открывать главный проект автоматически</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/MultiProjectPage.ui" line="113"/> + <location filename="../Preferences/ConfigurationPages/MultiProjectPage.ui" line="110"/> <source>Number of recent multiprojects:</source> <translation>Сколько недавних проектов запоминать:</translation> </message> @@ -32943,7 +34136,7 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/MultiProjectPage.py" line="70"/> + <location filename="../Preferences/ConfigurationPages/MultiProjectPage.py" line="73"/> <source>Select Workspace Directory</source> <translation type="unfinished"></translation> </message> @@ -33104,80 +34297,80 @@ <message> <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="62"/> <source>...</source> - <translation>...</translation> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="120"/> + <source>Select to use a web proxy</source> + <translation>Использовать прокси-сервер</translation> </message> <message> <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="123"/> - <source>Select to use a web proxy</source> - <translation>Использовать прокси-сервер</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="126"/> <source>Use network proxy</source> <translation>Использовать прокси-сервер</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.py" line="180"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.py" line="183"/> <source>Select download directory</source> <translation>Каталог для скачивания</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="68"/> + <source>Select to ask the user for a download filename</source> + <translation>Запрашивать пользователя куда загружать файл</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="71"/> - <source>Select to ask the user for a download filename</source> - <translation>Запрашивать пользователя куда загружать файл</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="74"/> <source>Request name of downloaded file</source> <translation>Запрашивать имя для загружаемого файла</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="135"/> + <source>Select to use the system proxy configuration</source> + <translation>Использовать системные настройки прокси</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="138"/> - <source>Select to use the system proxy configuration</source> - <translation>Использовать системные настройки прокси</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="141"/> <source>Use system proxy configuration</source> <translation>Использовать системные настройки прокси</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="148"/> + <source>Select to use an application specific proxy configuration</source> + <translation>Использовать специфические настройки прокси</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="151"/> - <source>Select to use an application specific proxy configuration</source> - <translation>Использовать специфические настройки прокси</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="154"/> <source>Manual proxy configuration:</source> <translation>Ручная конфигурация прокси:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="167"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="164"/> <source>Manual proxy settings</source> <translation>Ручная конфигурация прокси</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="183"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="180"/> <source>Enter the name of the HTTP proxy host</source> <translation>Введите имя HTTP прокси сервера</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="286"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="283"/> <source>Port:</source> <translation>Порт:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="197"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="194"/> <source>Enter the HTTP proxy port</source> <translation>Введите HTTP прокси порт</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="213"/> + <source>Select to use the HTTP proxy for all</source> + <translation>Всегда испоьзовать HTTP прокси</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="216"/> - <source>Select to use the HTTP proxy for all</source> - <translation>Всегда испоьзовать HTTP прокси</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="219"/> <source>Use this proxy for all protocols</source> <translation>Использовать этот прокси сервер для всех протоколов</translation> </message> @@ -33187,12 +34380,12 @@ <translation type="obsolete">Прокси для Https:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="233"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="230"/> <source>Enter the name of the HTTPS proxy host</source> <translation>Введите имя HTTPS прокси сервера</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="247"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="244"/> <source>Enter the HTTPS proxy port</source> <translation>Введите HTTPS прокси порт</translation> </message> @@ -33202,12 +34395,12 @@ <translation type="obsolete">Прокси для Ftp:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="279"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="276"/> <source>Enter the name of the FTP proxy host</source> <translation>Введите имя FTP прокси сервера</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="293"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="290"/> <source>Enter the FTP proxy port</source> <translation>Введите FTP прокси порт</translation> </message> @@ -33217,152 +34410,152 @@ <translation>Скачивание</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="81"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="78"/> <source>Download Manager Cleanup Policy</source> <translation>Правила для менеджера закачек</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="84"/> + <source>Select to never cleanup automatically</source> + <translation>Никогда не удалять автоматически</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="87"/> - <source>Select to never cleanup automatically</source> - <translation>Никогда не удалять автоматически</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="90"/> <source>Never</source> <translation>Никогда</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="94"/> + <source>Select to cleanup upon exiting</source> + <translation>Очищать при выходе</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="97"/> - <source>Select to cleanup upon exiting</source> - <translation>Очищать при выходе</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="100"/> <source>When exiting the application</source> <translation>При выходе из программы</translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="104"/> + <source>Select to cleanup after a successful download</source> + <translation>Очищать после успешной закачки</translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="107"/> - <source>Select to cleanup after a successful download</source> - <translation>Очищать после успешной закачки</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="110"/> <source>When download finished successfully</source> <translation>После успешной закачки</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="176"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="173"/> <source>HTTP-Proxy:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="226"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="223"/> <source>HTTPS-Proxy:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="266"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="263"/> <source>FTP-Proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="272"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="269"/> <source>Hostname:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="312"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="309"/> <source>Proxy Type:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="319"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="316"/> <source>Select the type of the FTP proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="326"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="323"/> <source>User Name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="333"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="330"/> <source>Enter the user name for the proxy authentication</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="340"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="337"/> <source>Password:</source> <translation>Пароль:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="347"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="344"/> <source>Enter the password for the proxy authentication</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="357"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="354"/> <source>Account:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="364"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="361"/> <source>Enter the account info for the proxy authentication</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="374"/> + <source>Press to clear the saved passwords for the Http(s) proxy</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="377"/> - <source>Press to clear the saved passwords for the Http(s) proxy</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.ui" line="380"/> <source>Clear HTTP(S) Proxy Passwords</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.py" line="39"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.py" line="42"/> <source>No FTP Proxy</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.py" line="41"/> - <source>No Proxy Authentication required</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/NetworkPage.py" line="44"/> + <source>No Proxy Authentication required</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/NetworkPage.py" line="47"/> <source>User@Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.py" line="46"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.py" line="49"/> <source>SITE</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.py" line="48"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.py" line="51"/> <source>OPEN</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.py" line="50"/> - <source>User@Proxyuser@Server</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Preferences/ConfigurationPages/NetworkPage.py" line="53"/> + <source>User@Proxyuser@Server</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/NetworkPage.py" line="56"/> <source>Proxyuser@Server</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.py" line="55"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.py" line="58"/> <source>AUTH and RESP</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/NetworkPage.py" line="57"/> + <location filename="../Preferences/ConfigurationPages/NetworkPage.py" line="60"/> <source>Bluecoat Proxy</source> <translation type="unfinished"></translation> </message> @@ -33378,52 +34571,52 @@ <context> <name>NewDialogClassDialog</name> <message> - <location filename="../Project/NewDialogClassDialog.ui" line="13"/> + <location filename="../Project/NewDialogClassDialog.ui" line="14"/> <source>New Dialog Class</source> <translation>Новый класс для диалога</translation> </message> <message> - <location filename="../Project/NewDialogClassDialog.ui" line="24"/> + <location filename="../Project/NewDialogClassDialog.ui" line="25"/> <source>Enter the path of the file for the forms code</source> <translation>Задайте путь до файла с кодом форм</translation> </message> <message> - <location filename="../Project/NewDialogClassDialog.ui" line="31"/> + <location filename="../Project/NewDialogClassDialog.ui" line="32"/> <source>&Classname:</source> <translation>Имя &класса:</translation> </message> <message> - <location filename="../Project/NewDialogClassDialog.ui" line="41"/> + <location filename="../Project/NewDialogClassDialog.ui" line="76"/> <source>Select the source file path via a directory selection dialog</source> <translation>Задайте путь до файла с исходниками с помощью диалога выбора файлов</translation> </message> <message> <location filename="../Project/NewDialogClassDialog.ui" line="44"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Project/NewDialogClassDialog.ui" line="51"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Project/NewDialogClassDialog.ui" line="42"/> <source>&Filename:</source> <translation>&Имя файла:</translation> </message> <message> - <location filename="../Project/NewDialogClassDialog.ui" line="61"/> + <location filename="../Project/NewDialogClassDialog.ui" line="52"/> <source>&Path:</source> <translation>&Путь:</translation> </message> <message> - <location filename="../Project/NewDialogClassDialog.ui" line="71"/> + <location filename="../Project/NewDialogClassDialog.ui" line="62"/> <source>Enter the name of the new class</source> <translation>Задайте имя нового класса</translation> </message> <message> - <location filename="../Project/NewDialogClassDialog.ui" line="78"/> + <location filename="../Project/NewDialogClassDialog.ui" line="69"/> <source>Enter the name of the file for the forms code</source> <translation>Задайте имя файла, который будет содержать исходный текст для форм</translation> </message> <message> - <location filename="../Project/NewDialogClassDialog.py" line="52"/> + <location filename="../Project/NewDialogClassDialog.py" line="59"/> <source>Select source directory</source> <translation>Задайте каталог с исходниками</translation> </message> @@ -33575,117 +34768,117 @@ <translation>Фориат чисел</translation> </message> <message> - <location filename="../UI/NumbersWidget.ui" line="25"/> + <location filename="../UI/NumbersWidget.ui" line="34"/> <source>Binary</source> <translation>Двоичный</translation> </message> <message> - <location filename="../UI/NumbersWidget.ui" line="34"/> + <location filename="../UI/NumbersWidget.ui" line="52"/> <source>Press to import the selected binary number</source> <translation>Импортировать выбранное двоичное число</translation> </message> <message> <location filename="../UI/NumbersWidget.ui" line="183"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../UI/NumbersWidget.ui" line="44"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../UI/NumbersWidget.ui" line="59"/> <source>Enter the binary number</source> <translation>Введите двоичное число</translation> </message> <message> - <location filename="../UI/NumbersWidget.ui" line="54"/> + <location filename="../UI/NumbersWidget.ui" line="69"/> <source>Press to send the binary number to the current editor</source> <translation>Переслать двоичное число в текущий редактор</translation> </message> <message> - <location filename="../UI/NumbersWidget.ui" line="67"/> + <location filename="../UI/NumbersWidget.ui" line="79"/> <source>Octal</source> <translation>Восьмеричный</translation> </message> <message> - <location filename="../UI/NumbersWidget.ui" line="76"/> + <location filename="../UI/NumbersWidget.ui" line="97"/> <source>Press to import the selected octal number</source> <translation>Импортировать выбранное восьмеричное число</translation> </message> <message> - <location filename="../UI/NumbersWidget.ui" line="86"/> + <location filename="../UI/NumbersWidget.ui" line="104"/> <source>Enter the octal number</source> <translation>Введите восьмеричное число</translation> </message> <message> - <location filename="../UI/NumbersWidget.ui" line="96"/> + <location filename="../UI/NumbersWidget.ui" line="114"/> <source>Press to send the octal number to the current editor</source> <translation>Переслать восьмеричное число в текущий редактор</translation> </message> <message> - <location filename="../UI/NumbersWidget.ui" line="109"/> + <location filename="../UI/NumbersWidget.ui" line="124"/> <source>Decimal</source> <translation>Десятичный</translation> </message> <message> - <location filename="../UI/NumbersWidget.ui" line="118"/> + <location filename="../UI/NumbersWidget.ui" line="142"/> <source>Press to import the selected decimal number</source> <translation>Импортировать выбранное десятичное число</translation> </message> <message> - <location filename="../UI/NumbersWidget.ui" line="128"/> + <location filename="../UI/NumbersWidget.ui" line="149"/> <source>Enter the decimal number</source> <translation>Введите десятичное число</translation> </message> <message> - <location filename="../UI/NumbersWidget.ui" line="138"/> + <location filename="../UI/NumbersWidget.ui" line="159"/> <source>Press to send the decimal number to the current editor</source> <translation>Переслать десятичное число в текущий редактор</translation> </message> <message> - <location filename="../UI/NumbersWidget.ui" line="151"/> + <location filename="../UI/NumbersWidget.ui" line="169"/> <source>Hexadecimal</source> <translation>Шестнадцатиричный</translation> </message> <message> - <location filename="../UI/NumbersWidget.ui" line="160"/> + <location filename="../UI/NumbersWidget.ui" line="187"/> <source>Press to import the selected hex number</source> <translation>Импортировать выбранное шестнадцатиричное число</translation> </message> <message> - <location filename="../UI/NumbersWidget.ui" line="170"/> + <location filename="../UI/NumbersWidget.ui" line="194"/> <source>Enter the hex number</source> <translation>Введите шестнадцатиричное число</translation> </message> <message> - <location filename="../UI/NumbersWidget.ui" line="180"/> + <location filename="../UI/NumbersWidget.ui" line="204"/> <source>Press to send the hex number to the current editor</source> <translation>Переслать шестнадцатиричное число в текущий редактор</translation> </message> <message> - <location filename="../UI/NumbersWidget.ui" line="231"/> + <location filename="../UI/NumbersWidget.ui" line="249"/> <source>Input Format:</source> <translation>Формат ввода:</translation> </message> <message> - <location filename="../UI/NumbersWidget.ui" line="238"/> + <location filename="../UI/NumbersWidget.ui" line="256"/> <source>Select the input format</source> <translation>Выберите формат ввода</translation> </message> <message> - <location filename="../UI/NumbersWidget.ui" line="251"/> + <location filename="../UI/NumbersWidget.ui" line="269"/> <source>Bitsize:</source> <translation>Разрядность:</translation> </message> <message> - <location filename="../UI/NumbersWidget.ui" line="258"/> + <location filename="../UI/NumbersWidget.ui" line="276"/> <source>Select the bit size</source> <translation>Задайте разрядность</translation> </message> <message> - <location filename="../UI/NumbersWidget.ui" line="271"/> + <location filename="../UI/NumbersWidget.ui" line="289"/> <source>Press to swap the current byte order</source> <translation>Поменять порядок байт</translation> </message> <message> - <location filename="../UI/NumbersWidget.ui" line="274"/> + <location filename="../UI/NumbersWidget.ui" line="292"/> <source>Swap byte order</source> <translation>Поменять порядок байт</translation> </message> @@ -35337,12 +36530,12 @@ <translation>Невозможно загрузить модуль. Ошибка: {0}</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1026"/> + <location filename="../PluginManager/PluginManager.py" line="1030"/> <source>Plugin Manager Error</source> <translation>Ошибка менеджера плагинов</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1026"/> + <location filename="../PluginManager/PluginManager.py" line="1030"/> <source><p>The plugin download directory <b>{0}</b> could not be created. Please configure it via the configuration dialog.</p><p>Reason: {1}</p></source> <translation><p>Папка для загруски плагинов <b>{0}</b> не может быть создана. Выберите её с помощью диалога.</p><p>Причина:{1}</p></translation> </message> @@ -35357,22 +36550,22 @@ <translation>Папка плагинов <b>{0}</b> не существует.</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1090"/> + <location filename="../PluginManager/PluginManager.py" line="1096"/> <source>Error downloading file</source> <translation type="unfinished">Ошибка скачивания файла</translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1090"/> + <location filename="../PluginManager/PluginManager.py" line="1096"/> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation type="unfinished"><p>Ошибка скачивания файла из {0}.</p><p>Ошибка: {1}</p></translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1125"/> + <location filename="../PluginManager/PluginManager.py" line="1131"/> <source>New plugin versions available</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PluginManager/PluginManager.py" line="1125"/> + <location filename="../PluginManager/PluginManager.py" line="1131"/> <source><p>There are new plug-ins or plug-in updates available. Use the plug-in repository dialog to get them.</p></source> <translation type="unfinished"></translation> </message> @@ -35417,101 +36610,126 @@ <message> <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="56"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/PluginManagerPage.py" line="94"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/PluginManagerPage.py" line="107"/> <source>Select plugins download directory</source> <translation>Выберите каталог, в который будут скачиваться плагины</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="72"/> + <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="121"/> <source>Select to enable external plugins to be loaded</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="124"/> + <source>Load external plugins</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="114"/> + <source><font color="#FF0000"><b>Note:</b> The following settings are activated at the next startup of the application.</font></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="131"/> + <source>Check for plugin updates</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="137"/> + <source>Select to disable update checking</source> + <translation type="unfinished">Запретить проверки</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="140"/> + <source>Never</source> + <translation type="unfinished">Никогда</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="147"/> + <source>Select to check for updates once a day</source> + <translation type="unfinished">Выполнять проверку один раз в день</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="150"/> + <source>Daily</source> + <translation type="unfinished">Ежедневно</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="157"/> + <source>Select to check for updates once a week</source> + <translation type="unfinished">Выполнять проверку один раз в неделю</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="160"/> + <source>Weekly</source> + <translation type="unfinished">Еженедельно</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="167"/> + <source>Select to check for updates once a month</source> + <translation type="unfinished">Выполнять проверку один раз в месяц</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="170"/> + <source>Monthly</source> + <translation type="unfinished">Ежемесячно</translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="192"/> + <source>Repository URL:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="199"/> + <source>Shows the repository URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="209"/> + <source>Press to edit the plugin repository URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="212"/> + <source>Edit URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="180"/> + <source>Select to check only already installed plugins for updates</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="183"/> + <source>Check only installed plugins for updates</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="62"/> + <source>Download Housekeeping</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="68"/> + <source>No. of generations to keep:</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="75"/> - <source>Load external plugins</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="65"/> - <source><font color="#FF0000"><b>Note:</b> The following settings are activated at the next startup of the application.</font></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="82"/> - <source>Check for plugin updates</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="88"/> - <source>Select to disable update checking</source> - <translation type="unfinished">Запретить проверки</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="91"/> - <source>Never</source> - <translation type="unfinished">Никогда</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="98"/> - <source>Select to check for updates once a day</source> - <translation type="unfinished">Выполнять проверку один раз в день</translation> + <source>Enter the number of generations to keep for each plugin</source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="101"/> - <source>Daily</source> - <translation type="unfinished">Ежедневно</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="108"/> - <source>Select to check for updates once a week</source> - <translation type="unfinished">Выполнять проверку один раз в неделю</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="111"/> - <source>Weekly</source> - <translation type="unfinished">Еженедельно</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="118"/> - <source>Select to check for updates once a month</source> - <translation type="unfinished">Выполнять проверку один раз в месяц</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="121"/> - <source>Monthly</source> - <translation type="unfinished">Ежемесячно</translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="143"/> - <source>Repository URL:</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="150"/> - <source>Shows the repository URL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="160"/> - <source>Press to edit the plugin repository URL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="163"/> - <source>Edit URL</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="131"/> - <source>Select to check only already installed plugins for updates</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="134"/> - <source>Check only installed plugins for updates</source> + <source>Select to keep generations of hidden plugins</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Preferences/ConfigurationPages/PluginManagerPage.ui" line="104"/> + <source>Keep generations of hidden plugins</source> <translation type="unfinished"></translation> </message> </context> @@ -35523,72 +36741,72 @@ <translation>Репозиторий плагинов</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.ui" line="47"/> + <location filename="../PluginManager/PluginRepositoryDialog.ui" line="50"/> <source>Name</source> <translation>Имя</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.ui" line="57"/> + <location filename="../PluginManager/PluginRepositoryDialog.ui" line="60"/> <source>Short Description</source> <translation>Краткое описание</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.ui" line="119"/> + <location filename="../PluginManager/PluginRepositoryDialog.ui" line="122"/> <source>URL:</source> <translation>URL:</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.ui" line="129"/> + <location filename="../PluginManager/PluginRepositoryDialog.ui" line="132"/> <source>Displays the download URL of the selected plugin</source> <translation>Показывает URL для скачивания выбранного плагина</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.ui" line="70"/> + <location filename="../PluginManager/PluginRepositoryDialog.ui" line="73"/> <source>Description:</source> <translation>Описание:</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.ui" line="89"/> + <location filename="../PluginManager/PluginRepositoryDialog.ui" line="92"/> <source>Displays the description of the selected plugin</source> <translation>Показывает описание выбранного плагина</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.ui" line="148"/> + <location filename="../PluginManager/PluginRepositoryDialog.ui" line="151"/> <source>Shows the progress of the current download</source> <translation>Показывает прогресс текущей закачки</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.ui" line="99"/> + <location filename="../PluginManager/PluginRepositoryDialog.ui" line="102"/> <source>Author:</source> <translation>Автор:</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.ui" line="109"/> + <location filename="../PluginManager/PluginRepositoryDialog.ui" line="112"/> <source>Displays the author of the selected plugin</source> <translation>Показывает автора выбранного плагина</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.ui" line="52"/> + <location filename="../PluginManager/PluginRepositoryDialog.ui" line="55"/> <source>Version</source> <translation>Версия</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.ui" line="167"/> + <location filename="../PluginManager/PluginRepositoryDialog.ui" line="170"/> <source>Repository URL:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.ui" line="174"/> + <location filename="../PluginManager/PluginRepositoryDialog.ui" line="177"/> <source>Shows the repository URL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.ui" line="184"/> - <source>Press to edit the plugin repository URL</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../PluginManager/PluginRepositoryDialog.ui" line="187"/> + <source>Press to edit the plugin repository URL</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.ui" line="190"/> <source>Edit URL</source> <translation type="unfinished"></translation> </message> @@ -35596,74 +36814,74 @@ <context> <name>PluginRepositoryWidget</name> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="68"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="74"/> <source>Update</source> <translation>Обновить</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="70"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="76"/> <source>Download</source> <translation>Скачать</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="77"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="83"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="80"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="86"/> <source>Close && Install</source> <translation>Закрыть и установить</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="283"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="322"/> <source>Download Plugin Files</source> <translation>Скачать файлы плагинов</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="283"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="322"/> <source>The requested plugins were downloaded.</source> <translation>Запрашиваемые плагины скачаны.</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="334"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="373"/> <source>Read plugins repository file</source> <translation>Прочитать файл репозитория плагинов</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="334"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="373"/> <source><p>The plugins repository file <b>{0}</b> could not be read. Select Update</p></source> <translation><p>Невозможно прочитать файл репозитория <b>{0}</b>. Выберите обновление</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="342"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="381"/> <source>No plugin repository file available. Select Update.</source> <translation>Нет доступного файла репозитория. Выберите обновление.</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="394"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="433"/> <source>Error downloading file</source> <translation>Ошибка скачивания файла</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="394"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="433"/> <source><p>Could not download the requested file from {0}.</p><p>Error: {1}</p></source> <translation><p>Ошибка скачивания файла из {0}.</p><p>Ошибка: {1}</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="467"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="510"/> <source>Stable</source> <translation>Стабильный</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="474"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="517"/> <source>Unstable</source> <translation>Нестабильный</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="481"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="524"/> <source>Unknown</source> <translation>Неизвестно</translation> </message> @@ -35678,35 +36896,85 @@ <translation type="obsolete"><p>Ошибки SSL: </p><p>{0}</p><p>Игнорировать?</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="73"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="79"/> <source>Download && Install</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="326"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="365"/> <source>Plugins Repository URL Changed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="326"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="365"/> <source>The URL of the Plugins Repository has changed. Select the "Update" button to get the new repository file.</source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="99"/> + <source>Hide</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="101"/> + <source>Hide Selected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="104"/> + <source>Show All</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="107"/> + <source>Cleanup Downloads</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="538"/> + <source>up-to-date</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="541"/> + <source>new download available</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="544"/> + <source>update installable</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="547"/> + <source>updated download available</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="717"/> + <source>Cleanup of Plugin Downloads</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="717"/> + <source><p>The plugin download <b>{0}</b> could not be deleted.</p><p>Reason: {1}</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PluginRepositoryWindow</name> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="804"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="804"/> <source><p>Could not start the process.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить процесс.<br>Убедитесь, что он доступен как <b>{0}</b>.</p></translation> </message> <message> - <location filename="../PluginManager/PluginRepositoryDialog.py" line="633"/> + <location filename="../PluginManager/PluginRepositoryDialog.py" line="804"/> <source>OK</source> <translation>OK</translation> </message> @@ -35714,27 +36982,27 @@ <context> <name>PluginUninstallDialog</name> <message> - <location filename="../PluginManager/PluginUninstallDialog.ui" line="13"/> + <location filename="../PluginManager/PluginUninstallDialog.ui" line="14"/> <source>Plugin Uninstallation</source> <translation>Деинсталляция подключаемых модулей</translation> </message> <message> - <location filename="../PluginManager/PluginUninstallDialog.ui" line="19"/> + <location filename="../PluginManager/PluginUninstallDialog.ui" line="20"/> <source>Plugin directory:</source> <translation>Каталог подключаемых модулей:</translation> </message> <message> - <location filename="../PluginManager/PluginUninstallDialog.ui" line="26"/> + <location filename="../PluginManager/PluginUninstallDialog.ui" line="27"/> <source>Select the plugin area containing the plugin to uninstall</source> <translation>Задайте область, которая содержит модуль, подлежащий деинсталляции</translation> </message> <message> - <location filename="../PluginManager/PluginUninstallDialog.ui" line="33"/> + <location filename="../PluginManager/PluginUninstallDialog.ui" line="34"/> <source>Plugin:</source> <translation>Подключаемый модуль:</translation> </message> <message> - <location filename="../PluginManager/PluginUninstallDialog.ui" line="40"/> + <location filename="../PluginManager/PluginUninstallDialog.ui" line="41"/> <source>Select the plugin to uninstall</source> <translation>Выберите подключаемый модуль для деинсталляции</translation> </message> @@ -35752,27 +37020,27 @@ <translation>Глобальный каталог плагинов</translation> </message> <message> - <location filename="../PluginManager/PluginUninstallDialog.py" line="190"/> + <location filename="../PluginManager/PluginUninstallDialog.py" line="193"/> <source>Plugin Uninstallation</source> <translation>Деинсталляция подключаемых модулей</translation> </message> <message> - <location filename="../PluginManager/PluginUninstallDialog.py" line="103"/> + <location filename="../PluginManager/PluginUninstallDialog.py" line="106"/> <source><p>The plugin <b>{0}</b> could not be unloaded. Aborting...</p></source> <translation><p>Невозможно выгрузить подключаемый модуль <b>{0}</b>. Отмена...</p></translation> </message> <message> - <location filename="../PluginManager/PluginUninstallDialog.py" line="115"/> + <location filename="../PluginManager/PluginUninstallDialog.py" line="118"/> <source><p>The plugin <b>{0}</b> has no 'packageName' attribute. Aborting...</p></source> <translation><p>Подключаемый модуль <b>{0}</b> не содержит атрибута 'packageName'. Отмена...</p></translation> </message> <message> - <location filename="../PluginManager/PluginUninstallDialog.py" line="169"/> + <location filename="../PluginManager/PluginUninstallDialog.py" line="172"/> <source><p>The plugin package <b>{0}</b> could not be removed. Aborting...</p><p>Reason: {1}</p></source> <translation><p>Невозможно удалить подключаемый модуль <b>{0}</b>. Отмена...</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../PluginManager/PluginUninstallDialog.py" line="190"/> + <location filename="../PluginManager/PluginUninstallDialog.py" line="193"/> <source><p>The plugin <b>{0}</b> was uninstalled successfully from {1}.</p></source> <translation><p>Подключаемый модуль <b>{0}</b> был успешно деинсталлирован из {1}.</p></translation> </message> @@ -35780,27 +37048,27 @@ <context> <name>Preferences</name> <message> - <location filename="../Preferences/__init__.py" line="1182"/> + <location filename="../Preferences/__init__.py" line="1197"/> <source>Export Preferences</source> <translation>Экспорт предпочтений</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1210"/> + <location filename="../Preferences/__init__.py" line="1225"/> <source>Import Preferences</source> <translation>Импорт предпочтений</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1210"/> + <location filename="../Preferences/__init__.py" line="1225"/> <source>Properties File (*.ini);;All Files (*)</source> <translation>Файлы свойств (*.ini);;Все файлы (*)</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1309"/> + <location filename="../Preferences/__init__.py" line="1324"/> <source>Select Python2 Interpreter</source> <translation>Выбрать интерпретатор Python 2</translation> </message> <message> - <location filename="../Preferences/__init__.py" line="1309"/> + <location filename="../Preferences/__init__.py" line="1324"/> <source>Select the Python2 interpreter to be used:</source> <translation>Выбрать интерпретатор Python 2 для использования:</translation> </message> @@ -36053,12 +37321,12 @@ <translation>(не настроено)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="327"/> + <location filename="../Preferences/ProgramsDialog.py" line="329"/> <source>(not executable)</source> <translation>(не исполняемый)</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="354"/> + <location filename="../Preferences/ProgramsDialog.py" line="356"/> <source>(not found)</source> <translation>(не найдено)</translation> </message> @@ -36068,7 +37336,7 @@ <translation>Внешние программы</translation> </message> <message> - <location filename="../Preferences/ProgramsDialog.py" line="325"/> + <location filename="../Preferences/ProgramsDialog.py" line="327"/> <source>(unknown)</source> <translation>(неизвестный)</translation> </message> @@ -36166,242 +37434,242 @@ <translation>Загрузить файл проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="886"/> + <location filename="../Project/Project.py" line="887"/> <source>Read project session</source> <translation>Загрузить сессию проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="1097"/> + <location filename="../Project/Project.py" line="1101"/> <source>Please save the project first.</source> <translation>Пожалуйста, сначала сохраните проект.</translation> </message> <message> - <location filename="../Project/Project.py" line="921"/> + <location filename="../Project/Project.py" line="923"/> <source>Save project session</source> <translation>Сохранить сессию проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="1209"/> + <location filename="../Project/Project.py" line="1213"/> <source>Add Language</source> <translation>Добавить язык перевода</translation> </message> <message> - <location filename="../Project/Project.py" line="1328"/> + <location filename="../Project/Project.py" line="1332"/> <source>Delete translation</source> <translation>Удалить перевод</translation> </message> <message> - <location filename="../Project/Project.py" line="1478"/> + <location filename="../Project/Project.py" line="1483"/> <source>Add file</source> <translation>Добавить файл</translation> </message> <message> - <location filename="../Project/Project.py" line="1594"/> + <location filename="../Project/Project.py" line="1600"/> <source>The target directory must not be empty.</source> <translation>Целевой каталог не доллжен быть пустым.</translation> </message> <message> - <location filename="../Project/Project.py" line="1605"/> + <location filename="../Project/Project.py" line="1611"/> <source>Add directory</source> <translation>Добавить каталог</translation> </message> <message> - <location filename="../Project/Project.py" line="1605"/> + <location filename="../Project/Project.py" line="1611"/> <source>The source directory must not be empty.</source> <translation>Исходный каталог не доллжен быть пустым.</translation> </message> <message> - <location filename="../Project/Project.py" line="1945"/> + <location filename="../Project/Project.py" line="1951"/> <source>Delete file</source> <translation>Удалить файл</translation> </message> <message> - <location filename="../Project/Project.py" line="2053"/> + <location filename="../Project/Project.py" line="2059"/> <source>Create project directory</source> <translation>Создать каталог проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="3289"/> + <location filename="../Project/Project.py" line="3307"/> <source>Open project</source> <translation>Открыть проект</translation> </message> <message> - <location filename="../Project/Project.py" line="3326"/> + <location filename="../Project/Project.py" line="3344"/> <source>Save project as</source> <translation>Сохранить проект как</translation> </message> <message> - <location filename="../Project/Project.py" line="2695"/> + <location filename="../Project/Project.py" line="2712"/> <source>Save File</source> <translation>Сохранить файл</translation> </message> <message> - <location filename="../Project/Project.py" line="2731"/> + <location filename="../Project/Project.py" line="2748"/> <source>Close Project</source> <translation>Закрыть проект</translation> </message> <message> - <location filename="../Project/Project.py" line="2731"/> + <location filename="../Project/Project.py" line="2748"/> <source>The current project has unsaved changes.</source> <translation>Изменения в текущем проекте не сохранены.</translation> </message> <message> - <location filename="../Project/Project.py" line="3490"/> + <location filename="../Project/Project.py" line="3508"/> <source>&Save</source> <translation>&Сохранить</translation> </message> <message> - <location filename="../Project/Project.py" line="3275"/> + <location filename="../Project/Project.py" line="3293"/> <source>New project</source> <translation>Новый проект</translation> </message> <message> - <location filename="../Project/Project.py" line="3275"/> + <location filename="../Project/Project.py" line="3293"/> <source>&New...</source> <translation>&Новый...</translation> </message> <message> - <location filename="../Project/Project.py" line="3280"/> + <location filename="../Project/Project.py" line="3298"/> <source>Generate a new project</source> <translation>Создать новый проект</translation> </message> <message> - <location filename="../Project/Project.py" line="3281"/> + <location filename="../Project/Project.py" line="3299"/> <source><b>New...</b><p>This opens a dialog for entering the info for a new project.</p></source> <translation><b>Новый...</b><p>Открыть диалог для ввода информации о новом проекте.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3289"/> - <source>&Open...</source> - <translation>&Открыть...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3294"/> - <source>Open an existing project</source> - <translation>Открыть существующий проект</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3295"/> - <source><b>Open...</b><p>This opens an existing project.</p></source> - <translation><b>Открыть...</b><p>Открыть существующий проект.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3302"/> - <source>Close project</source> - <translation>Закрыть проект</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3302"/> - <source>&Close</source> - <translation>&Закрыть</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3306"/> - <source>Close the current project</source> - <translation>Закрыть текущий проект</translation> - </message> - <message> <location filename="../Project/Project.py" line="3307"/> + <source>&Open...</source> + <translation>&Открыть...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3312"/> + <source>Open an existing project</source> + <translation>Открыть существующий проект</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3313"/> + <source><b>Open...</b><p>This opens an existing project.</p></source> + <translation><b>Открыть...</b><p>Открыть существующий проект.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3320"/> + <source>Close project</source> + <translation>Закрыть проект</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3320"/> + <source>&Close</source> + <translation>&Закрыть</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3324"/> + <source>Close the current project</source> + <translation>Закрыть текущий проект</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3325"/> <source><b>Close</b><p>This closes the current project.</p></source> <translation><b>Закрыть</b><p>Закрыть текущий проект.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3314"/> - <source>Save project</source> - <translation>Сохранить проект</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3318"/> - <source>Save the current project</source> - <translation>Сохранить текущий проект</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3319"/> - <source><b>Save</b><p>This saves the current project.</p></source> - <translation><b>Сохранить</b><p>Сохранить текущий проект.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3326"/> - <source>Save &as...</source> - <translation>Сохранить &как...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3330"/> - <source>Save the current project to a new file</source> - <translation>Сохранить текущий проект в новый файл</translation> - </message> - <message> <location filename="../Project/Project.py" line="3332"/> + <source>Save project</source> + <translation>Сохранить проект</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3336"/> + <source>Save the current project</source> + <translation>Сохранить текущий проект</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3337"/> + <source><b>Save</b><p>This saves the current project.</p></source> + <translation><b>Сохранить</b><p>Сохранить текущий проект.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3344"/> + <source>Save &as...</source> + <translation>Сохранить &как...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3348"/> + <source>Save the current project to a new file</source> + <translation>Сохранить текущий проект в новый файл</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3350"/> <source><b>Save as</b><p>This saves the current project to a new file.</p></source> <translation><b>Сохранить как</b><p> Сохранить текущий проект в новый файл.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3372"/> + <location filename="../Project/Project.py" line="3390"/> <source>Add translation to project</source> <translation>Добавить перевод в проект</translation> </message> <message> - <location filename="../Project/Project.py" line="3372"/> + <location filename="../Project/Project.py" line="3390"/> <source>Add &translation...</source> <translation>Добавить &перевод...</translation> </message> <message> - <location filename="../Project/Project.py" line="3377"/> + <location filename="../Project/Project.py" line="3395"/> <source>Add a translation to the current project</source> <translation>Добавить перевод в текущий проект</translation> </message> <message> - <location filename="../Project/Project.py" line="3379"/> + <location filename="../Project/Project.py" line="3397"/> <source><b>Add translation...</b><p>This opens a dialog for add a translation to the current project.</p></source> <translation><b>Добавить перевод...</b><p>Открыть диалог для добавления перевода в текущий проект.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3387"/> + <location filename="../Project/Project.py" line="3405"/> <source>Search new files</source> <translation>Поиск новых файлов</translation> </message> <message> - <location filename="../Project/Project.py" line="3387"/> + <location filename="../Project/Project.py" line="3405"/> <source>Searc&h new files...</source> <translation>Поис&к новых файлов...</translation> </message> <message> - <location filename="../Project/Project.py" line="3391"/> + <location filename="../Project/Project.py" line="3409"/> <source>Search new files in the project directory.</source> <translation>Поиск новых файлов в каталоге проекта.</translation> </message> <message> - <location filename="../Project/Project.py" line="3401"/> + <location filename="../Project/Project.py" line="3419"/> <source>Project properties</source> <translation>Свойства проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="3401"/> + <location filename="../Project/Project.py" line="3419"/> <source>&Properties...</source> <translation>&Свойства...</translation> </message> <message> - <location filename="../Project/Project.py" line="3406"/> + <location filename="../Project/Project.py" line="3424"/> <source>Show the project properties</source> <translation>Показать свойства проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="3407"/> + <location filename="../Project/Project.py" line="3425"/> <source><b>Properties...</b><p>This shows a dialog to edit the project properties.</p></source> <translation><b>Свойства...</b><p>Показать диалог для редактирования свойств проекта.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3529"/> + <location filename="../Project/Project.py" line="3547"/> <source>Load session</source> <translation>Загрузить сессию</translation> </message> <message> - <location filename="../Project/Project.py" line="3533"/> + <location filename="../Project/Project.py" line="3551"/> <source>Load the projects session file.</source> <translation>Загрузить файл с сессией проекта.</translation> </message> <message> - <location filename="../Project/Project.py" line="3534"/> + <location filename="../Project/Project.py" line="3552"/> <source><b>Load session</b><p>This loads the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Загрузить сессию</b> <p>Загрузить файл с сессией проекта. Сессия содержит следующие данные:<br> @@ -36413,17 +37681,17 @@ </p></translation> </message> <message> - <location filename="../Project/Project.py" line="3547"/> + <location filename="../Project/Project.py" line="3565"/> <source>Save session</source> <translation>Сохранить сессию</translation> </message> <message> - <location filename="../Project/Project.py" line="3551"/> + <location filename="../Project/Project.py" line="3569"/> <source>Save the projects session file.</source> <translation>Сохранить файл с сессией проекта.</translation> </message> <message> - <location filename="../Project/Project.py" line="3552"/> + <location filename="../Project/Project.py" line="3570"/> <source><b>Save session</b><p>This saves the projects session file. The session consists of the following data.<br>- all open source files<br>- all breakpoint<br>- the commandline arguments<br>- the working directory<br>- the exception reporting flag</p></source> <translation><b>Сохранить сессию</b> <p>Сохранить файл с сессией проекта. Сессия содержит следующие данные:<br> @@ -36435,137 +37703,137 @@ </p></translation> </message> <message> - <location filename="../Project/Project.py" line="3579"/> + <location filename="../Project/Project.py" line="3597"/> <source>Code Metrics</source> <translation>Статистика кода</translation> </message> <message> - <location filename="../Project/Project.py" line="3579"/> - <source>&Code Metrics...</source> - <translation>&Статистика кода...</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3583"/> - <source>Show some code metrics for the project.</source> - <translation>Отображает статистику кода для проекта.</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3585"/> - <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> - <translation><b>Статистика кода...</b><p>Отображает статистику кода для проекта.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3593"/> - <source>Python Code Coverage</source> - <translation>Охват кода Python</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3593"/> - <source>Code Co&verage...</source> - <translation>&Заключения по коду...</translation> - </message> - <message> <location filename="../Project/Project.py" line="3597"/> - <source>Show code coverage information for the project.</source> - <translation>Показать заключение охвата по коду проекта.</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3599"/> - <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> - <translation><b>Заключение охвата по коду...</b><p>Показать заключение охвата по коду всех файлов проекта.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="4358"/> - <source>Profile Data</source> - <translation>Данные профайлера</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3607"/> - <source>&Profile Data...</source> - <translation>&Данные профайлера...</translation> + <source>&Code Metrics...</source> + <translation>&Статистика кода...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3601"/> + <source>Show some code metrics for the project.</source> + <translation>Отображает статистику кода для проекта.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3603"/> + <source><b>Code Metrics...</b><p>This shows some code metrics for all Python files in the project.</p></source> + <translation><b>Статистика кода...</b><p>Отображает статистику кода для проекта.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3611"/> + <source>Python Code Coverage</source> + <translation>Охват кода Python</translation> </message> <message> <location filename="../Project/Project.py" line="3611"/> + <source>Code Co&verage...</source> + <translation>&Заключения по коду...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3615"/> + <source>Show code coverage information for the project.</source> + <translation>Показать заключение охвата по коду проекта.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3617"/> + <source><b>Code Coverage...</b><p>This shows the code coverage information for all Python files in the project.</p></source> + <translation><b>Заключение охвата по коду...</b><p>Показать заключение охвата по коду всех файлов проекта.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4377"/> + <source>Profile Data</source> + <translation>Данные профайлера</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3625"/> + <source>&Profile Data...</source> + <translation>&Данные профайлера...</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3629"/> <source>Show profiling data for the project.</source> <translation>Отображает результаты профилирования проекта.</translation> </message> <message> - <location filename="../Project/Project.py" line="3613"/> + <location filename="../Project/Project.py" line="3631"/> <source><b>Profile Data...</b><p>This shows the profiling data for the project.</p></source> <translation><b>Данные профайлера...</b><p>Отображает результаты профилирования проекта.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3720"/> + <location filename="../Project/Project.py" line="3738"/> <source>Open &Recent Projects</source> <translation>Открыть &недавние проекты</translation> </message> <message> - <location filename="../Project/Project.py" line="3725"/> + <location filename="../Project/Project.py" line="3743"/> <source>Chec&k</source> <translation>&Проверки</translation> </message> <message> - <location filename="../Project/Project.py" line="3727"/> + <location filename="../Project/Project.py" line="3745"/> <source>Sho&w</source> <translation>По&казать</translation> </message> <message> - <location filename="../Project/Project.py" line="3730"/> + <location filename="../Project/Project.py" line="3748"/> <source>Source &Documentation</source> <translation>&Документация исходников</translation> </message> <message> - <location filename="../Project/Project.py" line="4023"/> + <location filename="../Project/Project.py" line="4041"/> <source>Search New Files</source> <translation>Поиск новых файлов</translation> </message> <message> - <location filename="../Project/Project.py" line="4023"/> + <location filename="../Project/Project.py" line="4041"/> <source>There were no new files found to be added.</source> <translation>Не найдено файлов для добавления.</translation> </message> <message> - <location filename="../Project/Project.py" line="4169"/> + <location filename="../Project/Project.py" line="4187"/> <source>Version Control System</source> <translation>Система контроля версий</translation> </message> <message> - <location filename="../Project/Project.py" line="4335"/> + <location filename="../Project/Project.py" line="4354"/> <source>There is no main script defined for the current project. Aborting</source> <translation>Для текущего проекта не определён главный сценарий. Отмена</translation> </message> <message> - <location filename="../Project/Project.py" line="3721"/> + <location filename="../Project/Project.py" line="3739"/> <source>&Version Control</source> <translation>Контроль &версий</translation> </message> <message> - <location filename="../Project/Project.py" line="4286"/> + <location filename="../Project/Project.py" line="4305"/> <source>Coverage Data</source> <translation>Данные охвата</translation> </message> <message> - <location filename="../Project/Project.py" line="4412"/> + <location filename="../Project/Project.py" line="4431"/> <source>Application Diagram</source> <translation>Диаграмма приложения</translation> </message> <message> - <location filename="../Project/Project.py" line="3622"/> + <location filename="../Project/Project.py" line="3640"/> <source>&Application Diagram...</source> <translation>&Диаграмма приложения...</translation> </message> <message> - <location filename="../Project/Project.py" line="3626"/> + <location filename="../Project/Project.py" line="3644"/> <source>Show a diagram of the project.</source> <translation>Показать диаграмму проекта.</translation> </message> <message> - <location filename="../Project/Project.py" line="3628"/> + <location filename="../Project/Project.py" line="3646"/> <source><b>Application Diagram...</b><p>This shows a diagram of the project.</p></source> <translation><b>Диаграмма приложения...</b><p>Отображает диаграмму проекта.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3728"/> + <location filename="../Project/Project.py" line="3746"/> <source>&Diagrams</source> <translation>&Диаграммы</translation> </message> @@ -36575,73 +37843,73 @@ <translation>Сохранить файл проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="4309"/> + <location filename="../Project/Project.py" line="4328"/> <source>Code Coverage</source> <translation>Заключения охвата по коду</translation> </message> <message> - <location filename="../Project/Project.py" line="4309"/> + <location filename="../Project/Project.py" line="4328"/> <source>Please select a coverage file</source> <translation>Пожалуйста, выберите файл для информации охвата</translation> </message> <message> - <location filename="../Project/Project.py" line="4358"/> + <location filename="../Project/Project.py" line="4377"/> <source>Please select a profile file</source> <translation>Пожалуйста, выберите файл профиля</translation> </message> <message> - <location filename="../Project/Project.py" line="3357"/> + <location filename="../Project/Project.py" line="3375"/> <source>Add directory to project</source> <translation>Добавить каталог в проект</translation> </message> <message> - <location filename="../Project/Project.py" line="3357"/> + <location filename="../Project/Project.py" line="3375"/> <source>Add directory...</source> <translation>Добавить каталог...</translation> </message> <message> - <location filename="../Project/Project.py" line="3362"/> + <location filename="../Project/Project.py" line="3380"/> <source>Add a directory to the current project</source> <translation>Добавить каталог в текущий проект</translation> </message> <message> - <location filename="../Project/Project.py" line="3364"/> + <location filename="../Project/Project.py" line="3382"/> <source><b>Add directory...</b><p>This opens a dialog for adding a directory to the current project.</p></source> <translation><b>Добавить каталог...</b> <p>Открыть диалог для добавления каталога в текущий проект.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1729"/> + <location filename="../Project/Project.py" line="1735"/> <source>Rename file</source> <translation>Переименовать файл</translation> </message> <message> - <location filename="../Project/Project.py" line="1753"/> + <location filename="../Project/Project.py" line="1759"/> <source>Rename File</source> <translation>Переименовать файл</translation> </message> <message> - <location filename="../Project/Project.py" line="2184"/> + <location filename="../Project/Project.py" line="2193"/> <source>Shall the project file be added to the repository?</source> <translation>Добавить файл проекта в репозиторий?</translation> </message> <message> - <location filename="../Project/Project.py" line="2547"/> + <location filename="../Project/Project.py" line="2564"/> <source>New Project</source> <translation>Новый проект</translation> </message> <message> - <location filename="../Project/Project.py" line="2120"/> + <location filename="../Project/Project.py" line="2126"/> <source>Add existing files to the project?</source> <translation>Добавить существующие файлы в проект?</translation> </message> <message> - <location filename="../Project/Project.py" line="2235"/> + <location filename="../Project/Project.py" line="2245"/> <source>Would you like to edit the VCS command options?</source> <translation>Желаете ли вы редактировать опции команд VCS?</translation> </message> <message> - <location filename="../Project/Project.py" line="2208"/> + <location filename="../Project/Project.py" line="2217"/> <source>Select version control system for the project</source> <translation>Выберите систему контроля версий (VCS) для проекта</translation> </message> @@ -36656,57 +37924,57 @@ <translation><p>Невозможно сохранить файл проекта: <b>{0}</b></p></translation> </message> <message> - <location filename="../Project/Project.py" line="886"/> + <location filename="../Project/Project.py" line="887"/> <source><p>The project session file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл с сессией проекта: <b>{0}</b></p></translation> </message> <message> - <location filename="../Project/Project.py" line="921"/> + <location filename="../Project/Project.py" line="923"/> <source><p>The project session file <b>{0}</b> could not be written.</p></source> <translation><p>Невозможно сохранить файл с сессией проекта: <b>{0}</b></p></translation> </message> <message> - <location filename="../Project/Project.py" line="1328"/> + <location filename="../Project/Project.py" line="1332"/> <source><p>The selected translation file <b>{0}</b> could not be deleted.</p></source> <translation><p>Невозможно удалить выбранный файл с переводом: <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="2695"/> + <location filename="../Project/Project.py" line="2712"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже сущеструет. Переписать?</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1945"/> + <location filename="../Project/Project.py" line="1951"/> <source><p>The selected file <b>{0}</b> could not be deleted.</p></source> <translation><p>Невозможно удалить выбранный файл <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="2053"/> + <location filename="../Project/Project.py" line="2059"/> <source><p>The project directory <b>{0}</b> could not be created.</p></source> <translation><p>Невозможно создать каталог проекта <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="947"/> + <location filename="../Project/Project.py" line="949"/> <source>Delete project session</source> <translation>Удалить сессию проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="947"/> + <location filename="../Project/Project.py" line="949"/> <source><p>The project session file <b>{0}</b> could not be deleted.</p></source> <translation><p>Невозможно удалить выбранный файл с сессией: <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3565"/> + <location filename="../Project/Project.py" line="3583"/> <source>Delete session</source> <translation>Удалить сессию</translation> </message> <message> - <location filename="../Project/Project.py" line="3569"/> + <location filename="../Project/Project.py" line="3587"/> <source>Delete the projects session file.</source> <translation>Удалить файл с сессией проекта.</translation> </message> <message> - <location filename="../Project/Project.py" line="3570"/> + <location filename="../Project/Project.py" line="3588"/> <source><b>Delete session</b><p>This deletes the projects session file</p></source> <translation><b>Удалить сессию</b><p>Удалить файл с сессией проекта</p></translation> </message> @@ -36716,7 +37984,7 @@ <translation>Исходники на Ruby (*.rb);;</translation> </message> <message> - <location filename="../Project/Project.py" line="3393"/> + <location filename="../Project/Project.py" line="3411"/> <source><b>Search new files...</b><p>This searches for new files (sources, *.ui, *.idl) in the project directory and registered subdirectories.</p></source> <translation><b>Искать новые файлы...</b><p>Поиск новых файлов (исходников, *.ui, *.idl) в каталоге проекта и зарегистрированных подкаталогах.</p></translation> </message> @@ -36731,220 +37999,220 @@ <translation>Другое</translation> </message> <message> - <location filename="../Project/Project.py" line="4412"/> + <location filename="../Project/Project.py" line="4431"/> <source>Include module names?</source> <translation>Включать имена модулей?</translation> </message> <message> - <location filename="../Project/Project.py" line="1970"/> + <location filename="../Project/Project.py" line="1976"/> <source>Delete directory</source> <translation>Удалить каталог</translation> </message> <message> - <location filename="../Project/Project.py" line="1970"/> + <location filename="../Project/Project.py" line="1976"/> <source><p>The selected directory <b>{0}</b> could not be deleted.</p></source> <translation><p>Невозможно удалить каталог <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="976"/> + <location filename="../Project/Project.py" line="978"/> <source>Read tasks</source> <translation>Прочитать задачи</translation> </message> <message> - <location filename="../Project/Project.py" line="976"/> + <location filename="../Project/Project.py" line="978"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл с задачами: <b>{0}</b></p></translation> </message> <message> - <location filename="../Project/Project.py" line="996"/> + <location filename="../Project/Project.py" line="998"/> <source>Save tasks</source> <translation>Сохранить задачи</translation> </message> <message> - <location filename="../Project/Project.py" line="996"/> + <location filename="../Project/Project.py" line="998"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation><p>Невозможно сохранить файл с задачами: <b>{0}</b></p></translation> </message> <message> - <location filename="../Project/Project.py" line="1052"/> + <location filename="../Project/Project.py" line="1055"/> <source>Read debugger properties</source> <translation>Прочитать свойства отладчика</translation> </message> <message> - <location filename="../Project/Project.py" line="1052"/> + <location filename="../Project/Project.py" line="1055"/> <source><p>The project debugger properties file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл свойств отладчика <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1085"/> + <location filename="../Project/Project.py" line="1089"/> <source>Save debugger properties</source> <translation>Сохранить свойства отладчика</translation> </message> <message> - <location filename="../Project/Project.py" line="1085"/> + <location filename="../Project/Project.py" line="1089"/> <source><p>The project debugger properties file <b>{0}</b> could not be written.</p></source> <translation><p>Невозможно сохранить файл свойств отладчика <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1111"/> + <location filename="../Project/Project.py" line="1115"/> <source>Delete debugger properties</source> <translation>Удалить свойства отладчика</translation> </message> <message> - <location filename="../Project/Project.py" line="1111"/> + <location filename="../Project/Project.py" line="1115"/> <source><p>The project debugger properties file <b>{0}</b> could not be deleted.</p></source> <translation><p>Невозможно удалить файл свойств отладчика <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3465"/> + <location filename="../Project/Project.py" line="3483"/> <source>Debugger Properties</source> <translation>Свойства отладчика</translation> </message> <message> - <location filename="../Project/Project.py" line="3465"/> + <location filename="../Project/Project.py" line="3483"/> <source>Debugger &Properties...</source> <translation>&Свойства отладчика...</translation> </message> <message> - <location filename="../Project/Project.py" line="3469"/> + <location filename="../Project/Project.py" line="3487"/> <source>Show the debugger properties</source> <translation>Показать свойства отладчика</translation> </message> <message> - <location filename="../Project/Project.py" line="3470"/> + <location filename="../Project/Project.py" line="3488"/> <source><b>Debugger Properties...</b><p>This shows a dialog to edit project specific debugger settings.</p></source> <translation><b>Свойства отладчика...</b> <p>Показать диалог для редактирования свойств отладчика, специфичных для данного проекта.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3478"/> + <location filename="../Project/Project.py" line="3496"/> <source>Load</source> <translation>Загрузить</translation> </message> <message> - <location filename="../Project/Project.py" line="3478"/> + <location filename="../Project/Project.py" line="3496"/> <source>&Load</source> <translation>&Загрузить</translation> </message> <message> - <location filename="../Project/Project.py" line="3482"/> + <location filename="../Project/Project.py" line="3500"/> <source>Load the debugger properties</source> <translation>Загрузить свойства отладчика</translation> </message> <message> - <location filename="../Project/Project.py" line="3490"/> + <location filename="../Project/Project.py" line="3508"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../Project/Project.py" line="3494"/> + <location filename="../Project/Project.py" line="3512"/> <source>Save the debugger properties</source> <translation>Сохранить свойства отладчика</translation> </message> <message> - <location filename="../Project/Project.py" line="3502"/> + <location filename="../Project/Project.py" line="3520"/> <source>Delete</source> <translation>Удалить</translation> </message> <message> - <location filename="../Project/Project.py" line="3502"/> + <location filename="../Project/Project.py" line="3520"/> <source>&Delete</source> <translation>&Удалить</translation> </message> <message> - <location filename="../Project/Project.py" line="3506"/> + <location filename="../Project/Project.py" line="3524"/> <source>Delete the debugger properties</source> <translation>Удалить свойства отладчика</translation> </message> <message> - <location filename="../Project/Project.py" line="3515"/> + <location filename="../Project/Project.py" line="3533"/> <source>Reset</source> <translation>Сбросить</translation> </message> <message> - <location filename="../Project/Project.py" line="3515"/> + <location filename="../Project/Project.py" line="3533"/> <source>&Reset</source> <translation>&Сбросить</translation> </message> <message> - <location filename="../Project/Project.py" line="3519"/> + <location filename="../Project/Project.py" line="3537"/> <source>Reset the debugger properties</source> <translation>Сбросить свойства отладчика</translation> </message> <message> - <location filename="../Project/Project.py" line="3732"/> + <location filename="../Project/Project.py" line="3750"/> <source>Debugger</source> <translation>Отладчик</translation> </message> <message> - <location filename="../Project/Project.py" line="3729"/> + <location filename="../Project/Project.py" line="3747"/> <source>Session</source> <translation>Сессия</translation> </message> <message> - <location filename="../Project/Project.py" line="3483"/> + <location filename="../Project/Project.py" line="3501"/> <source><b>Load Debugger Properties</b><p>This loads the project specific debugger settings.</p></source> <translation><b>Загрузить свойства отладчика</b> <p>Загрузить свойства отладчика, специфичные для данного проекта.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3495"/> + <location filename="../Project/Project.py" line="3513"/> <source><b>Save Debugger Properties</b><p>This saves the project specific debugger settings.</p></source> <translation><b>Сохранить свойства отладчика</b><p>Сохранить свойства отладчика, специфичные для данного проекта.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3507"/> + <location filename="../Project/Project.py" line="3525"/> <source><b>Delete Debugger Properties</b><p>This deletes the file containing the project specific debugger settings.</p></source> <translation><b>Удалить свойства отладчика</b><p>Удалить свойства отладчика, специфичные для данного проекта.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3520"/> + <location filename="../Project/Project.py" line="3538"/> <source><b>Reset Debugger Properties</b><p>This resets the project specific debugger settings.</p></source> <translation><b>Сбросить свойства отладчика</b><p>Сбросить свойства отладчика, специфичные для данного проекта.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3429"/> + <location filename="../Project/Project.py" line="3447"/> <source>Filetype Associations</source> <translation>Ассоциации для типа файла</translation> </message> <message> - <location filename="../Project/Project.py" line="3429"/> + <location filename="../Project/Project.py" line="3447"/> <source>Filetype Associations...</source> <translation>Ассоциации для типа файла...</translation> </message> <message> - <location filename="../Project/Project.py" line="3433"/> + <location filename="../Project/Project.py" line="3451"/> <source>Show the project filetype associations</source> <translation>Показать ассоциации типов файлов для проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="3435"/> + <location filename="../Project/Project.py" line="3453"/> <source><b>Filetype Associations...</b><p>This shows a dialog to edit the filetype associations of the project. These associations determine the type (source, form, interface or others) with a filename pattern. They are used when adding a file to the project and when performing a search for new files.</p></source> <translation><b>Ассоциации типов файлов...</b> <p>Показать диалог для редактирования ассоциаций типов файлов для проекта. Эти ассоциации связывают тип файла (исходник, форма, интерфейс и т.д.) с шаблоном имени. Они используются при добавлении файлов в проект и при поиске новых файлов.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3733"/> + <location filename="../Project/Project.py" line="3751"/> <source>Pac&kagers</source> <translation>У&паковщики</translation> </message> <message> - <location filename="../Project/Project.py" line="3341"/> + <location filename="../Project/Project.py" line="3359"/> <source>Add files to project</source> <translation>Добавить файлы в проект</translation> </message> <message> - <location filename="../Project/Project.py" line="3341"/> + <location filename="../Project/Project.py" line="3359"/> <source>Add &files...</source> <translation>Добавить &файлы...</translation> </message> <message> - <location filename="../Project/Project.py" line="3346"/> + <location filename="../Project/Project.py" line="3364"/> <source>Add files to the current project</source> <translation>Добавить файлы в текущий проект</translation> </message> <message> - <location filename="../Project/Project.py" line="3348"/> + <location filename="../Project/Project.py" line="3366"/> <source><b>Add files...</b><p>This opens a dialog for adding files to the current project. The place to add is determined by the file extension.</p></source> <translation><b>Добавить файлы</b> <p>Открывает диалог для добавления файлов в текущий проект. Место добавления определяется расширением файла.</p></translation> @@ -36960,32 +38228,32 @@ <translation type="obsolete">Qt4 Консоль</translation> </message> <message> - <location filename="../Project/Project.py" line="1753"/> + <location filename="../Project/Project.py" line="1759"/> <source><p>The file <b>{0}</b> could not be renamed.<br />Reason: {1}</p></source> <translation><p>Невозможно переименовать файл <b>{0}</b>:<br>Причина: {1}.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="2680"/> + <location filename="../Project/Project.py" line="2697"/> <source>Project Files (*.e4p)</source> <translation>Файлы проектов (*.e4p)</translation> </message> <message> - <location filename="../Project/Project.py" line="3719"/> + <location filename="../Project/Project.py" line="3737"/> <source>&Project</source> <translation>&Проект</translation> </message> <message> - <location filename="../Project/Project.py" line="3840"/> + <location filename="../Project/Project.py" line="3858"/> <source>Project</source> <translation>Проект</translation> </message> <message> - <location filename="../Project/Project.py" line="3902"/> + <location filename="../Project/Project.py" line="3920"/> <source>&Clear</source> <translation>&Очистить</translation> </message> <message> - <location filename="../Project/Project.py" line="1540"/> + <location filename="../Project/Project.py" line="1545"/> <source><p>The file <b>{0}</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже существует. Переписать?</p></translation> </message> @@ -37010,33 +38278,33 @@ <translation><p>Невозможно записать файл пользовательских настроек <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3414"/> + <location filename="../Project/Project.py" line="3432"/> <source>User project properties</source> <translation>Пользовательские настройки проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="3414"/> + <location filename="../Project/Project.py" line="3432"/> <source>&User Properties...</source> <translation>&Пользовательские свойства...</translation> </message> <message> - <location filename="../Project/Project.py" line="3419"/> + <location filename="../Project/Project.py" line="3437"/> <source>Show the user specific project properties</source> <translation>Показать пользовательские свойства проекта</translation> </message> <message> - <location filename="../Project/Project.py" line="3421"/> + <location filename="../Project/Project.py" line="3439"/> <source><b>User Properties...</b><p>This shows a dialog to edit the user specific project properties.</p></source> <translation><b>Пользовательские свойства...</b> <p>Отображает диалог для редактирования пользовательских свойств проекта.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="2893"/> + <location filename="../Project/Project.py" line="2911"/> <source>Syntax errors detected</source> <translation>Найдены синтаксисические ошибки</translation> </message> <message numerus="yes"> - <location filename="../Project/Project.py" line="2893"/> + <location filename="../Project/Project.py" line="2911"/> <source>The project contains %n file(s) with syntax errors.</source> <translation> <numerusform>Проект содержит %n файл с синтаксическими ошибками.</numerusform> @@ -37045,62 +38313,62 @@ </translation> </message> <message> - <location filename="../Project/Project.py" line="4570"/> + <location filename="../Project/Project.py" line="4589"/> <source>Create Package List</source> <translation>Создать список пакетов</translation> </message> <message> - <location filename="../Project/Project.py" line="3651"/> + <location filename="../Project/Project.py" line="3669"/> <source>Create &Package List</source> <translation>&Создать список пакетов</translation> </message> <message> - <location filename="../Project/Project.py" line="4762"/> + <location filename="../Project/Project.py" line="4782"/> <source>Create Plugin Archive</source> <translation>Создать архив подключаемого модуля</translation> </message> <message> - <location filename="../Project/Project.py" line="3667"/> + <location filename="../Project/Project.py" line="3685"/> <source>Create Plugin &Archive</source> <translation>Создать &архив плагина</translation> </message> <message> - <location filename="../Project/Project.py" line="4530"/> + <location filename="../Project/Project.py" line="4549"/> <source><p>The file <b>PKGLIST</b> already exists.</p><p>Overwrite it?</p></source> <translation><p>Файл <b>PKGLIST</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4570"/> - <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> - <translation><p>Невозможно создать файл <b>PKGLIST</b>.</p><p>Причина: {0}</p></translation> - </message> - <message> <location filename="../Project/Project.py" line="4589"/> + <source><p>The file <b>PKGLIST</b> could not be created.</p><p>Reason: {0}</p></source> + <translation><p>Невозможно создать файл <b>PKGLIST</b>.</p><p>Причина: {0}</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="4609"/> <source><p>The file <b>PKGLIST</b> does not exist. Aborting...</p></source> <translation><p>Файл <b>PKGLIST</b> не существует. Отмена...</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4598"/> + <location filename="../Project/Project.py" line="4618"/> <source>The project does not have a main script defined. Aborting...</source> <translation>Для текущего проекта не определён главный сценарий. Отмена...</translation> </message> <message> - <location filename="../Project/Project.py" line="4612"/> + <location filename="../Project/Project.py" line="4632"/> <source><p>The file <b>PKGLIST</b> could not be read.</p><p>Reason: {0}</p></source> <translation><p>Невозможно прочитать файл <b>PKGLIST</b>.</p><p>Причина: {0}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1509"/> + <location filename="../Project/Project.py" line="1514"/> <source><p>The source directory doesn't contain any files belonging to the selected category.</p></source> <translation><p>Каталог не содержит ни одного файла, принадлежащего к заданной категории.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="2547"/> + <location filename="../Project/Project.py" line="2564"/> <source>Select Version Control System</source> <translation>Выберите систему контроля версий (VCS)</translation> </message> <message> - <location filename="../Project/Project.py" line="2215"/> + <location filename="../Project/Project.py" line="2224"/> <source>None</source> <translation>Нет</translation> </message> @@ -37115,37 +38383,37 @@ <translation type="obsolete"><p>Тип проекта <b>{0}</b> уже существует.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4651"/> + <location filename="../Project/Project.py" line="4671"/> <source><p>The file <b>{0}</b> could not be stored in the archive. Ignoring it.</p><p>Reason: {1}</p></source> <translation><p>Невозможно сохранить в архив файл <b>{0}</b>. Игнорируем его.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3683"/> + <location filename="../Project/Project.py" line="3701"/> <source>Create Plugin Archive (Snapshot)</source> <translation>Создать архив плагинов (снимок)</translation> </message> <message> - <location filename="../Project/Project.py" line="3683"/> + <location filename="../Project/Project.py" line="3701"/> <source>Create Plugin Archive (&Snapshot)</source> <translation>Создать архив плагинов (&снимок)</translation> </message> <message> - <location filename="../Project/Project.py" line="4720"/> + <location filename="../Project/Project.py" line="4740"/> <source><p>The plugin file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation><p>Невозможно прочитать файл плагина <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1209"/> + <location filename="../Project/Project.py" line="1213"/> <source>You have to specify a translation pattern first.</source> <translation>Необходимо задать образец перевода.</translation> </message> <message> - <location filename="../Project/Project.py" line="2308"/> + <location filename="../Project/Project.py" line="2323"/> <source>Translation Pattern</source> <translation>Образец перевода</translation> </message> <message> - <location filename="../Project/Project.py" line="2308"/> + <location filename="../Project/Project.py" line="2323"/> <source>Enter the path pattern for translation files (use '%language%' in place of the language code):</source> <translation>Введите образец имени файла для переводов (используйте '%language%' вместо кода языка):</translation> </message> @@ -37155,27 +38423,27 @@ <translation type="obsolete"><p>Выбранная VCS <b>{0}</b> не найдена.<br/>Отмена.</p><p>{1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4169"/> + <location filename="../Project/Project.py" line="4187"/> <source><p>The selected VCS <b>{0}</b> could not be found.<br/>Disabling version control.</p><p>{1}</p></source> <translation><p>Выбранная VCS <b>{0}</b> не найдена.<br/>Контроль версий не используется.</p><p>{1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3447"/> + <location filename="../Project/Project.py" line="3465"/> <source>Lexer Associations</source> <translation>Ассоциации для лексеров</translation> </message> <message> - <location filename="../Project/Project.py" line="3447"/> + <location filename="../Project/Project.py" line="3465"/> <source>Lexer Associations...</source> <translation>Ассоциации для лексеров...</translation> </message> <message> - <location filename="../Project/Project.py" line="3451"/> + <location filename="../Project/Project.py" line="3469"/> <source>Show the project lexer associations (overriding defaults)</source> <translation>Показать ассоциации для лексеров</translation> </message> <message> - <location filename="../Project/Project.py" line="3453"/> + <location filename="../Project/Project.py" line="3471"/> <source><b>Lexer Associations...</b><p>This shows a dialog to edit the lexer associations of the project. These associations override the global lexer associations. Lexers are used to highlight the editor text.</p></source> <translation><b>Ассоциации для лексеров...</b><p>Показать ассоциации лексеров для проекта. Лексеры используются для подсвечивания текста в редакторе.</p></translation> </message> @@ -37200,52 +38468,52 @@ <translation>Подключаемый модуль Eric</translation> </message> <message> - <location filename="../Project/Project.py" line="3656"/> + <location filename="../Project/Project.py" line="3674"/> <source>Create an initial PKGLIST file for an eric5 plugin.</source> <translation>Создать начальный файл PKGLIST для подключаемого модуля eric5.</translation> </message> <message> - <location filename="../Project/Project.py" line="3658"/> + <location filename="../Project/Project.py" line="3676"/> <source><b>Create Package List</b><p>This creates an initial list of files to include in an eric5 plugin archive. The list is created from the project file.</p></source> <translation><b>Создать список пакетов</b><p>Создаёт начальный список файлов для включения в архив подключаемого модуля eric5. Список создаётся из файла проекта.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="3672"/> - <source>Create an eric5 plugin archive file.</source> - <translation>Создать архив подключаемого модуля eric5.</translation> - </message> - <message> - <location filename="../Project/Project.py" line="3674"/> - <source><b>Create Plugin Archive</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name.</p></source> - <translation><b>Создать архив подключаемого модуля</b><p>Создаёт файл арива подключаемого модуля eric5, используя список файлов, данный в файле PKGLIST. Имя архива берётся из имени главного сценария.</p></translation> - </message> - <message> - <location filename="../Project/Project.py" line="3688"/> - <source>Create an eric5 plugin archive file (snapshot release).</source> - <translation>Создать файл архива плагинов eric5 (снимок выпуска).</translation> - </message> - <message> <location filename="../Project/Project.py" line="3690"/> + <source>Create an eric5 plugin archive file.</source> + <translation>Создать архив подключаемого модуля eric5.</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3692"/> + <source><b>Create Plugin Archive</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name.</p></source> + <translation><b>Создать архив подключаемого модуля</b><p>Создаёт файл арива подключаемого модуля eric5, используя список файлов, данный в файле PKGLIST. Имя архива берётся из имени главного сценария.</p></translation> + </message> + <message> + <location filename="../Project/Project.py" line="3706"/> + <source>Create an eric5 plugin archive file (snapshot release).</source> + <translation>Создать файл архива плагинов eric5 (снимок выпуска).</translation> + </message> + <message> + <location filename="../Project/Project.py" line="3708"/> <source><b>Create Plugin Archive (Snapshot)</b><p>This creates an eric5 plugin archive file using the list of files given in the PKGLIST file. The archive name is built from the main script name. The version entry of the main script is modified to reflect a snapshot release.</p></source> <translation><b>Создать файл архива плагинов (снимок выпуска)</b><p>Создаёт файл архива плагинов eric5, используя список файлов, указанный в файле PKGLIST. Имя архива строится из имени главного сценария. Версия главного сценария меняется, чтобы соответствовать версии выпуска снимка.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4625"/> + <location filename="../Project/Project.py" line="4645"/> <source><p>The eric5 plugin archive file <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation><p>Невозможно создать подключаемый модуль eric5 <b>{0}</b>.</p><p>Причина: {1}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="4674"/> + <location filename="../Project/Project.py" line="4694"/> <source><p>The eric5 plugin archive file <b>{0}</b> was created successfully.</p></source> <translation><p>Подключаемый модуль <b>{0}</b> был успешно создан.</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1466"/> + <location filename="../Project/Project.py" line="1471"/> <source><p>The selected file <b>{0}</b> could not be added to <b>{1}</b>.</p><p>Reason: {2}</p></source> <translation><p>Невозможно добавить файл <b>{0}</b> в архив <b>{1}</b>. </p><p>Причина: {2}</p></translation> </message> <message> - <location filename="../Project/Project.py" line="1522"/> + <location filename="../Project/Project.py" line="1527"/> <source><p>The target directory <b>{0}</b> could not be created.</p><p>Reason: {1}</p></source> <translation><p>Невозможно создать каталог <b>{0}</b> </p><p>Причина: {1}</p></translation> </message> @@ -37255,32 +38523,32 @@ <translation>Python2 файлы (*.py2);;Python2 GUI файлы (*.pyw2);;</translation> </message> <message> - <location filename="../Project/Project.py" line="2107"/> + <location filename="../Project/Project.py" line="2113"/> <source>Create main script</source> <translation>Создать главный сценарий</translation> </message> <message> - <location filename="../Project/Project.py" line="2107"/> + <location filename="../Project/Project.py" line="2113"/> <source><p>The mainscript <b>{0}</b> could not be created.<br/>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3636"/> + <location filename="../Project/Project.py" line="3654"/> <source>Load Diagram</source> <translation>Загрузить диаграмму</translation> </message> <message> - <location filename="../Project/Project.py" line="3636"/> + <location filename="../Project/Project.py" line="3654"/> <source>&Load Diagram...</source> <translation>&Загрузить диаграмму...</translation> </message> <message> - <location filename="../Project/Project.py" line="3640"/> + <location filename="../Project/Project.py" line="3658"/> <source>Load a diagram from file.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="3642"/> + <location filename="../Project/Project.py" line="3660"/> <source><b>Load Diagram...</b><p>This loads a diagram from file.</p></source> <translation type="unfinished"></translation> </message> @@ -37320,12 +38588,12 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4158"/> + <location filename="../Project/Project.py" line="4176"/> <source><p>The selected VCS <b>{0}</b> could not be found. <br/>Reverting override.</p><p>{1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/Project.py" line="4762"/> + <location filename="../Project/Project.py" line="4782"/> <source><p>The plugin file <b>{0}</b> could not be read.</p> <p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -37366,42 +38634,42 @@ <context> <name>ProjectBrowser</name> <message> - <location filename="../Project/ProjectBrowser.py" line="67"/> + <location filename="../Project/ProjectBrowser.py" line="69"/> <source>files added</source> <translation>добавленные файлы</translation> </message> <message> + <location filename="../Project/ProjectBrowser.py" line="70"/> + <source>local modifications</source> + <translation>локальные изменения</translation> + </message> + <message> + <location filename="../Project/ProjectBrowser.py" line="73"/> + <source>update required</source> + <translation>необходимо обновление</translation> + </message> + <message> + <location filename="../Project/ProjectBrowser.py" line="74"/> + <source>conflict</source> + <translation>конфликт</translation> + </message> + <message> <location filename="../Project/ProjectBrowser.py" line="68"/> - <source>local modifications</source> - <translation>локальные изменения</translation> - </message> - <message> - <location filename="../Project/ProjectBrowser.py" line="71"/> - <source>update required</source> - <translation>необходимо обновление</translation> + <source>up to date</source> + <translation>новых изменений нет</translation> </message> <message> <location filename="../Project/ProjectBrowser.py" line="72"/> - <source>conflict</source> - <translation>конфликт</translation> - </message> - <message> - <location filename="../Project/ProjectBrowser.py" line="66"/> - <source>up to date</source> - <translation>новых изменений нет</translation> - </message> - <message> - <location filename="../Project/ProjectBrowser.py" line="70"/> <source>files replaced</source> <translation>файлы заменены</translation> </message> <message> - <location filename="../Project/ProjectBrowser.py" line="69"/> + <location filename="../Project/ProjectBrowser.py" line="71"/> <source>files removed</source> <translation>файлы удалены</translation> </message> <message> - <location filename="../Project/ProjectBrowser.py" line="382"/> + <location filename="../Project/ProjectBrowser.py" line="384"/> <source>unknown status</source> <translation>статус неизвестен</translation> </message> @@ -38674,7 +39942,7 @@ <translation>Запись временного файла проекта</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="951"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="956"/> <source>Translation file generation</source> <translation>Создание файлов перевода</translation> </message> @@ -38686,25 +39954,25 @@ <message> <location filename="../Project/ProjectTranslationsBrowser.py" line="951"/> <source>The generation of the translation files (*.ts) has failed.</source> - <translation>Создание файлов перевода (*.ts) не удалось.</translation> - </message> - <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1231"/> + <translation type="obsolete">Создание файлов перевода (*.ts) не удалось.</translation> + </message> + <message> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1236"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1145"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1150"/> <source>Translation file release</source> <translation>Релиз файлов перевода</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1128"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1133"/> <source>The release of the translation files (*.qm) was successful.</source> <translation>Релиз файлов перевода (*.ts) прошёл успешно.</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1145"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1150"/> <source>The release of the translation files (*.qm) has failed.</source> <translation>Релиз файлов перевода (*.ts) не удался.</translation> </message> @@ -38749,7 +40017,7 @@ <translation><p>Невозможно сохранить временный файл проекта: <b>{0}</b></p></translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1231"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1236"/> <source><p>Could not start lrelease.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить lrelease.<br>Убедитесь, что он находится в <b>{0}</b>.</p></translation> </message> @@ -38779,7 +40047,7 @@ <translation>Не выбрано ни одного файла переводов (*.ts).</translation> </message> <message> - <location filename="../Project/ProjectTranslationsBrowser.py" line="1059"/> + <location filename="../Project/ProjectTranslationsBrowser.py" line="1064"/> <source>Could not start {0}.<br>Ensure that it is in the search path.</source> <translation>Невозможно запустить {0}.<br>Убедитесь, что он находится в пути поиска.</translation> </message> @@ -38813,26 +40081,36 @@ <source>Open</source> <translation type="unfinished">Открыть</translation> </message> + <message> + <location filename="../Project/ProjectTranslationsBrowser.py" line="952"/> + <source> The process has crashed.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Project/ProjectTranslationsBrowser.py" line="956"/> + <source>The generation of the translation files (*.ts) has failed.{0}</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>PropertiesDialog</name> <message> - <location filename="../Project/PropertiesDialog.py" line="155"/> + <location filename="../Project/PropertiesDialog.py" line="180"/> <source>Select project directory</source> <translation>Выберите каталог проекта</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="208"/> + <location filename="../Project/PropertiesDialog.py" line="233"/> <source>Select main script file</source> <translation>Выберите файл с главным сценарием</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="108"/> + <location filename="../Project/PropertiesDialog.py" line="119"/> <source>The project is version controlled by <b>{0}</b>.</source> <translation>Проект находится под управлением <b>{0}</b>.</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="114"/> + <location filename="../Project/PropertiesDialog.py" line="125"/> <source>The project is not version controlled.</source> <translation>Проект не находится под управлением системы контроля версий.</translation> </message> @@ -38851,24 +40129,24 @@ <p>Если проект находится под управлением системы контроля версий (VCS), кнопка "Показать информацию о репозитории" покажет информацию о репозитории :-)</p></translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="285"/> + <location filename="../Project/PropertiesDialog.ui" line="257"/> <source>Enter authors email</source> <translation>Адрес электронной почты автора</translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="288"/> + <location filename="../Project/PropertiesDialog.ui" line="260"/> <source><b>Email</b> <p>Enter the email address of the author</p></source> <translation><b>Email</b> <p>Задайте адрес электронной почты автора</p></translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="181"/> + <location filename="../Project/PropertiesDialog.ui" line="167"/> <source>Enter the main script</source> <translation>Задайте главный сценарий</translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="184"/> + <location filename="../Project/PropertiesDialog.ui" line="170"/> <source><b>Main Script</b> <p>Enter the main script of the project. You may select it with a dialog by pressing the button to the right.</p></source> @@ -38882,14 +40160,14 @@ <translation>Задайте описание</translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="312"/> + <location filename="../Project/PropertiesDialog.ui" line="284"/> <source><b>Description</b> <p>Enter a short description for the project.</p></source> <translation><b>Описание</b> <p>Задайте краткое описание проекта.</p></translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="254"/> + <location filename="../Project/PropertiesDialog.ui" line="226"/> <source>&Author:</source> <translation>&Автор:</translation> </message> @@ -38904,7 +40182,7 @@ <translation>&Каталог проекта:</translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="150"/> + <location filename="../Project/PropertiesDialog.ui" line="136"/> <source>&Version No.:</source> <translation>Номер &версии:</translation> </message> @@ -38938,7 +40216,7 @@ с помощью диалога, вызываемого по кнопке справа.</p></translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="171"/> + <location filename="../Project/PropertiesDialog.ui" line="157"/> <source>&Main Script:</source> <translation>&Главный сценарий сценарий:</translation> </message> @@ -38948,12 +40226,12 @@ <translation>&Описание:</translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="193"/> + <location filename="../Project/PropertiesDialog.ui" line="309"/> <source>Show file selection dialog</source> <translation>Показать диалог выбора файлов</translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="196"/> + <location filename="../Project/PropertiesDialog.ui" line="312"/> <source><b>Main Script</b> <p>Select the projects main script via a file selection dialog.</p></source> <translation><b>Главный сценарий</b> @@ -38962,34 +40240,34 @@ <message> <location filename="../Project/PropertiesDialog.ui" line="200"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Project/PropertiesDialog.ui" line="136"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Project/PropertiesDialog.ui" line="298"/> <source>Show directory selection dialog</source> <translation>Показать диалог выбора каталога</translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="139"/> + <location filename="../Project/PropertiesDialog.ui" line="301"/> <source><b>Project Directory</b> <p>Select a project directory via a directory selection dialog.</p></source> <translation><b>Каталог проекта</b> <p>Выберите каталог назначения с помощью диалога.</p></translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="264"/> + <location filename="../Project/PropertiesDialog.ui" line="236"/> <source>Enter authors name</source> <translation>Задайте имена авторов</translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="267"/> + <location filename="../Project/PropertiesDialog.ui" line="239"/> <source><b>Author</b> <p>Enter the name of the author.</p></source> <translation><b>Автор</b> <p>Задайте имя автора.</p></translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="275"/> + <location filename="../Project/PropertiesDialog.ui" line="247"/> <source>&Email:</source> <translation>&Email:</translation> </message> @@ -39006,39 +40284,39 @@ <p>Задайте название проекта</p></translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="160"/> + <location filename="../Project/PropertiesDialog.ui" line="146"/> <source>Enter the version number</source> <translation>Задайте версию</translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="163"/> + <location filename="../Project/PropertiesDialog.ui" line="149"/> <source><b>Version No.</b> <p>Enter the version no.</p></source> <translation><b>Версия No.</b> <p>Задайте номер версии.</p></translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="353"/> + <location filename="../Project/PropertiesDialog.ui" line="347"/> <source>Press to show information about the repository</source> <translation>Нажмите, чтобы просмотреть информацию о репозитории</translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="356"/> + <location filename="../Project/PropertiesDialog.ui" line="350"/> <source>Show &Repository Info</source> <translation>Показать информацию о &репозитории</translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="359"/> + <location filename="../Project/PropertiesDialog.ui" line="353"/> <source>Alt+R</source> <translation>Alt+R</translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="207"/> + <location filename="../Project/PropertiesDialog.ui" line="179"/> <source>Press to edit the translations properties</source> <translation>Редактировать свойства переводов</translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="210"/> + <location filename="../Project/PropertiesDialog.ui" line="182"/> <source>Translations Properties...</source> <translation>Свойства переводов...</translation> </message> @@ -39048,7 +40326,7 @@ <translation>&Тип проекта:</translation> </message> <message> - <location filename="../Project/PropertiesDialog.py" line="206"/> + <location filename="../Project/PropertiesDialog.py" line="231"/> <source>Source Files ({0});;All Files (*)</source> <translation>Файлы с исходниками ({0});;Все файлы (*)</translation> </message> @@ -39090,42 +40368,42 @@ <translation>Параметры проверки орфографии...</translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="217"/> + <location filename="../Project/PropertiesDialog.ui" line="189"/> <source>End of &Line Character:</source> <translation>Символы &конца строки:</translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="227"/> + <location filename="../Project/PropertiesDialog.ui" line="199"/> <source>Select the end of line character to be used by the project</source> <translation>Выбрать символы конца строки для проекта</translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="231"/> + <location filename="../Project/PropertiesDialog.ui" line="203"/> <source>System</source> <translation>Система</translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="236"/> + <location filename="../Project/PropertiesDialog.ui" line="208"/> <source>Unix</source> <translation>Unix</translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="241"/> + <location filename="../Project/PropertiesDialog.ui" line="213"/> <source>Macintosh</source> <translation>Macintosh</translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="246"/> + <location filename="../Project/PropertiesDialog.ui" line="218"/> <source>Windows/DOS</source> <translation>Windows/DOS</translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="328"/> + <location filename="../Project/PropertiesDialog.ui" line="322"/> <source>Select to create a version controlled project</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Project/PropertiesDialog.ui" line="331"/> + <location filename="../Project/PropertiesDialog.ui" line="325"/> <source>Version Controlled Project</source> <translation type="unfinished"></translation> </message> @@ -39133,22 +40411,22 @@ <context> <name>Purge</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="91"/> <source>Purge All Files</source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="92"/> + <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="96"/> - <source>Do really want to delete all files not tracked by Mercurial (including ignored ones)?</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="100"/> <source>Purge Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="101"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py" line="97"/> <source>Do really want to delete files not tracked by Mercurial?</source> <translation type="unfinished"></translation> </message> @@ -39723,50 +41001,50 @@ <message> <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="416"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="443"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="386"/> <source>Regexp:</source> <translation>Регулярное выражение:</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="481"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="424"/> <source>"^" matches beginning of line, "$" matches end of line</source> <translation>"^" - начало строки, "$" - конец строки</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="484"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="427"/> <source>Match Linebreaks</source> <translation>Включать переносы строк</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="498"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="441"/> <source>Verbose Regexp</source> <translation>Verbose Regexp</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="505"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="448"/> <source>Case Sensitive</source> <translation>Учитывать регистр</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="518"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="461"/> <source>Observe Locale</source> <translation>Выбрать локаль</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="525"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="468"/> <source>"." matches linebreaks as well</source> <translation>"." включает также переносы строк</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="528"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="471"/> <source>Dot matches Linebreak</source> <translation>Не включать переносы строк</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="537"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="480"/> <source>Text:</source> <translation>Текст:</translation> </message> @@ -39778,20 +41056,20 @@ <p>Вставить комментарий внутрь регулярного выражения.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="121"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="118"/> <source><b>Single character of a range (e.g. [abcd])</b><p>Select a single character of a range via a specific dialog.</p></source> <translation><b>Один символ из множества (напр. [abcd])</b> <p>Вставить один символ из множества с помощью специального диалога.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="134"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="128"/> <source><b>Any character: '.'</b> <p>Select to insert a dot (.) in your regexp.</p></source> <translation><b>Любой символ: '.'</b> <p>Вставить точку (.) в регулярное выражение.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="138"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="132"/> <source><b>Any character: '.'</b> <p>Select to insert a dot (.) in your regexp. The dot matches a single character, except line break characters (by default). E.g. 'gr.y' matches 'gray', 'grey', 'gr%y', etc. Use the dot sparingly. Often, a character class or negated @@ -39801,21 +41079,21 @@ Например, 'gr.y' совпадает с 'gray', 'grey', 'gr%y', и т.д. Используйте точку без фанатизма. Часто использование класса символов или дополнения до класса символов быстрее и более точно.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="155"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="146"/> <source><b>Repeat contents</b> <p>Select a repetition condition via a specific dialog. This dialog will help to specify the allowed range for repetitions.</p></source> <translation><b>Повторять содержимое</b> <p>Задайте условия повторения с помощью специального диалога. Этот диалог поможет указать допустимые пределы для повторений.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="166"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="154"/> <source><b>Non capturing parentheses: (?:)</b> <p>Select to insert some non capturing brackets.</p></source> <translation><b>Скобки без захвата: (?:)</b> <p>Вставить скобки, которые группируют, но не попадают в выражения захвата.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="170"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="158"/> <source><b>Non capturing parentheses: (?:)</b> <p>Select to insert some non capturing brackets. It can be used to apply a regexp quantifier (eg. '?' or '+') to the entire group of characters inside the brakets. E.g. the regex 'Set(?:Value)?' matches 'Set' or 'SetValue'. The '?:' inside the brakets @@ -39826,14 +41104,14 @@ означает, что содержимое скобок (называемое обратной ссылкой) не сохраняется для дальнейшего использования.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="183"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="168"/> <source><b>Group: ()</b> <p>Select to insert some capturing brackets.</p></source> <translation><b>Группа: ()</b> <p>Вставить скобки с захватом содержимого.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="187"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="172"/> <source><b>Group: ()</b> <p>Select to insert some capturing brackets. They can be used to apply a regexp quantifier (e.g. '?' or '+') to the entire group of characters inside the brakets. E.g. the regex 'Set(Value)?' matches 'Set' or 'SetValue'. Contrary to non-capturing parentheses, @@ -39850,28 +41128,28 @@ <p>Например, '([a-c])x\1x\1' совпадёт с 'axaxa', 'bxbxb' и 'cxcxc'.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="202"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="184"/> <source><b>Named group: (?P&lt;<i>groupname</i>&gt;)</b> <p>Select to insert some named group brackets.</p></source> <translation><b>Именованная группа: (?P&lt;<i>имя</i>&gt;)</b> <p>Вставить скобки именованной группы.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="237"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="213"/> <source><b>Alternatives: '|'</b> <p>Select to insert the alternation symbol '|'. </p></source> <translation><b>Альтернативы: '|'</b> <p>Вставить символ альтернатив '|'. </p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="255"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="228"/> <source><b>Begin of line: '^'</b> <p>Select to insert the start line character (^).</p></source> <translation><b>Начало строки: '^'</b> <p>Вставить символ начала строки (^).</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="259"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="232"/> <source><b>Begin of line: '^'</b> <p>Select to insert the start line character (^). It is used to find some expressions at the begining of lines. E.g. '^[A-Z]' match lines starting with a capitalized character. </p></source> @@ -39880,21 +41158,21 @@ Например, '^[A-Z]' совпадает заглавной латинской буквой, стоящей в начале строки. </p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="275"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="245"/> <source><b>End of line: '$'</b> <p>Select to insert the end of line character ($). It is used to find some expressions at the end of lines.</p></source> <translation><b>Конец строки: '$'</b> <p>Вставить символ конца строки ($). Используется для поиска выражений в конце строк.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="286"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="253"/> <source><b>Word boundary</b> <p>Select to insert the word boudary character (\b).</p></source> <translation><b>Граница слова</b> <p>Вставить символ границы слова (\b).</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="290"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="257"/> <source><b>Word boundary</b> <p>Select to insert the word boudary character (\b). This character is used to express the fact that word must begin or end at this position. E.g. '\bcat\b' matches exactly the word 'cat' while 'concatenation' is ignored.</p></source> @@ -39903,14 +41181,14 @@ Например, '\bcat\b' совпадает исключительно со словом 'cat', в то время как слово 'concatenation' будет пропущено.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="302"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="266"/> <source><b>Non word boundary</b> <p>Select to insert the word boudary character (\B). \B is the negated version of \b.</p></source> <translation><b>Не граница слова</b> <p>Вставить символ не границы слова (\B). Это выражение, обратное выражению \b.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="306"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="270"/> <source><b>Non word boundary</b> <p>Select to insert the word boudary character (\B). \B is the negated version of \b. \B matches at every position where \b does not. Effectively, \B matches at any position between two word characters as well as at any position between two non-word characters.</p></source> @@ -39918,31 +41196,31 @@ <p>Вставить символ не границы слова (\B). Это выражение, обратное выражению \b. \B совпадает с любой позицией, с которой не совпадает \b. Фактически, \B совпадает с любой позицией между символов в слове, и также с любой позицией между символов дополнения до слова</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="318"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="279"/> <source><b>Positive lookahead: (?=<i>regexpr</i>)</b> <p>Select to insert the positive lookhead brackets.</p></source> <translation><b>Положительная предварительная проверка: (?=<i>regexpr</i>)</b> <p>Вставить скобки положительной предварительной проверки.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="335"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="293"/> <source><b>Negative lookahead: (?!<i>regexpr</i>)</b> <p>Select to insert the negative lookhead brackets.</p></source> <translation><b>Отрицательная предварительная проверка: (?=<i>regexpr</i>)</b><p>Вставить скобки отрицательной предварительной проверки.</p></translation> </message> <message> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="307"/> + <source><b>Positive lookbehind: (?&lt;=<i>regexpr</i>)</b> +<p>Select to insert the positive lookbehind brackets.</p></source> + <translation><b>Положительная ретроспективная проверка: (?&lt;=<i>regexpr</i>)</b><p>Вставить скобки положительной ретроспективной проверки.</p></translation> + </message> + <message> <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="352"/> - <source><b>Positive lookbehind: (?&lt;=<i>regexpr</i>)</b> -<p>Select to insert the positive lookbehind brackets.</p></source> - <translation><b>Положительная ретроспективная проверка: (?&lt;=<i>regexpr</i>)</b><p>Вставить скобки положительной ретроспективной проверки.</p></translation> - </message> - <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="403"/> <source><b>Undo last edit</b></source> <translation><b>Отменить последнее изменение</b></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="413"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="359"/> <source><b>Redo last edit</b></source> <translation><b>Восстановить последнее отменённое изменение</b></translation> </message> @@ -39958,13 +41236,13 @@ <p>(?#year)(19|20)\d\d[- /.](?#month)(0[1-9]|1[012])[- /.](?#day)(0[1-9]|[12][0-9]|3[01])</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="124"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="121"/> <source><b>Single character of a range (e.g. [abcd])</b><p>Select a single character of a range via a specific dialog. This dialog will help to edit the range of characters and add some specific conditions.</p>s</source> <translation><b>Один символ из множества (напр. [abcd])</b> <p>Выбрать множество символов с помощью специального диалога. Этот диалог поможет выбрать множество символов и задать некоторые специфические ограничения.</p>s</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="206"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="188"/> <source><b>Named group: (?P&lt;<i>groupname</i>&gt;)</b> <p>Select to insert some named group brackets. Usage is similar to standard group parentheses as the matched backreference is also stored for further usage. The difference is that a name is given to the match. This is useful when @@ -39974,14 +41252,14 @@ <p>Вставить скобки именованной группы. Использование этой группы аналогично использованию стандартной группы. Отличие состоит в том, что обратной ссылке присваивается имя. Это полезно, когда работа с группами становится достаточно сложной. Доступ к обратной ссылке можно получить по имени (напр. (?P<foo>[abc])x(?P=foo)x(?P=foo)x совпадает с 'axaxax','bxbxbx' или 'cxcxcx' ('foo' — это имя группы)</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="220"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="199"/> <source><b>Reference named group: (?P=<i>groupname</i>)</b> <p>Select to insert a reference to named group previously declared.</p></source> <translation><b>Ссылка на именованную группу: (?P=<i>имя</i>)</b> <p>Сослаться на предварительно объявленную именованную группу.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="224"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="203"/> <source><b>Reference named group: (?P=<i>groupname</i>)</b> <p>Select to insert a reference to named group previously declared. Each reference group refers to the match found by the corresponding named group. In the following example, (?P=foo) may refer to the charaters 'a','b' or 'c'.</p> @@ -39992,7 +41270,7 @@ <p>Напр. (?P<foo>[abc])x(?P=foo)x(?P=foo)x совпадает с 'axaxax','bxbxbx' или 'cxcxcx'.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="241"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="217"/> <source><b>Alternatives: '|'</b> <p>Select to insert the alternation symbol '|'. The alternation is used to match a single regular expression out of several possible regular expressions. E.g. 'cat|dog|mouse|fish' matches words containing the word 'cat', 'dog','mouse' or 'fish'. @@ -40003,14 +41281,14 @@ Обратите внимание, что в приведённом примере альтернативы ссылаются как на целые слова, так и на части слов. Если необходимо совпадение с целыми словами 'cat', 'dog', ... необходимо выразить это следующим образом: '\b(cat|dog|mouse|fish)\b'</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="271"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="241"/> <source><b>End of line: '$'</b> <p>Select to insert the end of line character ($).</p></source> <translation><b>Окончание строки: '$'</b> <p>Вставить символ окончания строки ($).</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="322"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="283"/> <source><b>Positive lookahead: (?=<i>regexpr</i>)</b> <p>Select to insert the positive lookhead brackets. Basically, positive lookhead is used to match a character only if followed by another one. Writting 'q(?=u)' means that you want to match the 'q' character only if it is followed by 'u'. In this statement 'u' is a trivial @@ -40020,7 +41298,7 @@ Выражение 'q(?=u)' совпадает с символом 'q', только если за ним следует символ 'u'. В этом примере, 'u' — это простейшее регулярное выражение, которое можно заменить на более сложное: q(?=[abc])' совпадает с 'q', если за ним следует 'a', 'b' или 'c'.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="339"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="297"/> <source><b>Negative lookahead: (?!<i>regexpr</i>)</b> <p>Select to insert the negative lookhead brackets. Basically, negative lookhead is used to match a character only if it is not followed by a another one. Writting 'q(?!u)' means that you want to match 'q' only if it is not followed by 'u'. In this statement, 'u' is a @@ -40028,7 +41306,7 @@ <translation><b>Отрицательная предварительная проверка: (?!<i>regexpr</i>)</b><p>Вставить скобки отрицательной предварительной проверки. В основном, отрицательная предварительная проверка используется для совпадения с символом, за которым не следует другой символВыражение 'q(?!u)' совпадает с символом 'q', только если за ним не следует символ 'u'. В этом примере, 'u' — это простейшее регулярное выражение, которое можно заменить на более сложное: q(?![abc])' совпадает с 'q', если за ним следует что угодно, кроме 'a', 'b' или 'c'.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="356"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="311"/> <source><b>Positive lookbehind: (?&lt;=<i>regexpr</i>)</b> <p>Select to insert the positive lookbehind brackets. Lookbehind has the same effect as lookahead, but works backwards. It is used to match a character only if preceded by another one. Writting '(?&lt;=u)q' means that you want to match the 'q' character @@ -40036,14 +41314,14 @@ <translation><b>Положительная ретроспективная проверка: (?&lt;=<i>regexpr</i>)</b><p>Вставить скобки положительной ретроспективной проверки.</p>. Ретроспективная проверка работает аналогично предварительной, но в обратную сторону. Она используется, чтобы выразить совпадение с символом, если перед ним находится ещё один. Выражение '(?&lt;=u)q' совпадает с символом 'q', только если перед ним находится символ 'u'. Как и при предварительной проверке, 'u' можно заменить на более сложное регулярное выражение; '(?&lt;=[abc])q' совпадёт с 'q', если перед ней находится 'a', 'b' или 'c'.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="369"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="321"/> <source><b>Negative lookbehind (?&lt;!<i>regexpr</i>)</b> <p>Select to insert the negative lookbehind brackets.</p></source> <translation><b>Отрицательная предварительная проверка: (?&lt;!<i>regexpr</i>)</b> <p>Вставить скобки отрицательной предварительной проверки.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="373"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="325"/> <source><b>Negative lookbehind (?&lt;!<i>regexpr</i>)</b> <p>Select to insert the negative lookbehind brackets. Lookbehind has the same effect as lookahead, but works backwards. It is used to match a character only if not preceded by another one. Writting '(?&lt;!u)q' means that you want to match the 'q' @@ -40068,7 +41346,7 @@ <translation>Python 3</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="491"/> + <location filename="../Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.ui" line="434"/> <source>ASCII</source> <translation>ASCII</translation> </message> @@ -41702,31 +42980,31 @@ <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="477"/> <source>...</source> - <translation type="unfinished">...</translation> - </message> - <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="89"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="86"/> <source><b>Redo last edit</b></source> <translation type="unfinished"><b>Восстановить последнее отменённое изменение</b></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="407"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="383"/> <source><b>Single character of a range (e.g. [abcd])</b><p>Select a single character of a range via a specific dialog.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="410"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="386"/> <source><b>Single character of a range (e.g. [abcd])</b><p>Select a single character of a range via a specific dialog. This dialog will help to edit the range of characters and add some specific conditions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="420"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="393"/> <source><b>Any character: '.'</b> <p>Select to insert a dot (.) in your regexp.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="424"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="397"/> <source><b>Any character: '.'</b> <p>Select to insert a dot (.) in your regexp. The dot matches a single character, except line break characters (by default). E.g. 'gr.y' matches 'gray', 'grey', 'gr%y', etc. Use the dot sparingly. Often, a character class or negated @@ -41734,19 +43012,19 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="441"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="411"/> <source><b>Repeat contents</b> <p>Select a repetition condition via a specific dialog. This dialog will help to specify the allowed range for repetitions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="165"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="159"/> <source><b>Non capturing parentheses: (?:)</b> <p>Select to insert some non capturing brackets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="169"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="163"/> <source><b>Non capturing parentheses: (?:)</b> <p>Select to insert some non capturing brackets. It can be used to apply a regexp quantifier (eg. '?' or '+') to the entire group of characters inside the brakets. E.g. the regex 'Set(?:Value)?' matches 'Set' or 'SetValue'. The '?:' inside the brakets @@ -41754,13 +43032,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="452"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="419"/> <source><b>Group: ()</b> <p>Select to insert some capturing brackets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="186"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="177"/> <source><b>Group: ()</b> <p>Select to insert some capturing brackets. They can be used to apply a regexp quantifier (e.g. '?' or '+') to the entire group of characters inside the brakets. E.g. the regex 'Set(Value)?' matches 'Set' or 'SetValue'. Contrary to non-capturing parentheses, @@ -41770,13 +43048,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="468"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="432"/> <source><b>Alternatives: '|'</b> <p>Select to insert the alternation symbol '|'. </p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="205"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="193"/> <source><b>Alternatives: '|'</b> <p>Select to insert the alternation symbol '|'. The alternation is used to match a single regular expression out of several possible regular expressions. E.g. 'cat|dog|mouse|fish' matches words containing the word 'cat', 'dog','mouse' or 'fish'. @@ -41785,64 +43063,64 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="219"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="204"/> <source><b>Begin of line: '^'</b> <p>Select to insert the start line character (^).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="223"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="208"/> <source><b>Begin of line: '^'</b> <p>Select to insert the start line character (^). It is used to find some expressions at the begining of lines. E.g. '^[A-Z]' match lines starting with a capitalized character. </p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="235"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="217"/> <source><b>End of line: '$'</b> <p>Select to insert the end of line character ($).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="239"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="221"/> <source><b>End of line: '$'</b> <p>Select to insert the end of line character ($). It is used to find some expressions at the end of lines.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="250"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="229"/> <source><b>Word boundary</b> <p>Select to insert the word boudary character (\b).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="254"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="233"/> <source><b>Word boundary</b> <p>Select to insert the word boudary character (\b). This character is used to express the fact that word must begin or end at this position. E.g. '\bcat\b' matches exactly the word 'cat' while 'concatenation' is ignored.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="266"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="242"/> <source><b>Non word boundary</b> <p>Select to insert the word boudary character (\B). \B is the negated version of \b.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="270"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="246"/> <source><b>Non word boundary</b> <p>Select to insert the word boudary character (\B). \B is the negated version of \b. \B matches at every position where \b does not. Effectively, \B matches at any position between two word characters as well as at any position between two non-word characters.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="282"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="255"/> <source><b>Positive lookahead: (?=<i>regexpr</i>)</b> <p>Select to insert the positive lookhead brackets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="286"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="259"/> <source><b>Positive lookahead: (?=<i>regexpr</i>)</b> <p>Select to insert the positive lookhead brackets. Basically, positive lookhead is used to match a character only if followed by another one. Writting 'q(?=u)' means that you want to match the 'q' character only if it is followed by 'u'. In this statement 'u' is a trivial @@ -41850,13 +43128,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="299"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="269"/> <source><b>Negative lookahead: (?!<i>regexpr</i>)</b> <p>Select to insert the negative lookhead brackets.</p></source> <translation type="unfinished"><b>Отрицательная предварительная проверка: (?=<i>regexpr</i>)</b><p>Вставить скобки отрицательной предварительной проверки.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="303"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="273"/> <source><b>Negative lookahead: (?!<i>regexpr</i>)</b> <p>Select to insert the negative lookhead brackets. Basically, negative lookhead is used to match a character only if it is not followed by a another one. Writting 'q(?!u)' means that you want to match 'q' only if it is not followed by 'u'. In this statement, 'u' is a @@ -41864,71 +43142,71 @@ <translation type="unfinished"><b>Отрицательная предварительная проверка: (?!<i>regexpr</i>)</b><p>Вставить скобки отрицательной предварительной проверки. В основном, отрицательная предварительная проверка используется для совпадения с символом, за которым не следует другой символВыражение 'q(?!u)' совпадает с символом 'q', только если за ним не следует символ 'u'. В этом примере, 'u' — это простейшее регулярное выражение, которое можно заменить на более сложное: q(?![abc])' совпадает с 'q', если за ним следует что угодно, кроме 'a', 'b' или 'c'.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="354"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="327"/> <source><b>Any character: '.'</b> <p>Select to insert a question mark (?) in your regexp.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="358"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="331"/> <source><b>Any character: '.'</b> <p>Select to insert a question mark (?) in your regexp. The question mark matches a single character. E.g. 'gr?y' matches 'gray', 'grey', 'gr%y', etc.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="370"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="340"/> <source><b>Repeat contents</b> <p>Inserts a repetition (*) character into the regexp.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="374"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="344"/> <source><b>Repeat contents</b> <p>Inserts a repetition (*) character into the regexp. That will match zero or more of any character.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="456"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="423"/> <source><b>Group: ()</b> <p>Select to insert some capturing brackets. They can be used to apply a regexp quantifier (e.g. '?' or '+') to the entire group of characters inside the brakets. E.g. the regex 'Set(Value)?' matches 'Set' or 'SetValue'.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="472"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="436"/> <source><b>Alternatives: '|'</b> <p>Select to insert the alternation symbol '|'. The alternation is used to match a single regular expression out of several possible regular expressions. E.g. 'cat|dog|mouse|fish' matches words containing the word 'cat', 'dog','mouse' or 'fish'.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="502"/> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="463"/> <source>&Regexp:</source> <translation type="unfinished">Регулярное &выражение:</translation> </message> <message> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="473"/> + <source>&Text:</source> + <translation type="unfinished">&Текст:</translation> + </message> + <message> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="496"/> + <source>Case &Sensitive</source> + <translation type="unfinished">Учитывать &регистр</translation> + </message> + <message> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="499"/> + <source>Alt+S</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="509"/> + <source>&Minimal</source> + <translation type="unfinished">&Минимальное</translation> + </message> + <message> <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="512"/> - <source>&Text:</source> - <translation type="unfinished">&Текст:</translation> - </message> - <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="535"/> - <source>Case &Sensitive</source> - <translation type="unfinished">Учитывать &регистр</translation> - </message> - <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="538"/> - <source>Alt+S</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="548"/> - <source>&Minimal</source> - <translation type="unfinished">&Минимальное</translation> - </message> - <message> - <location filename="../Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.ui" line="551"/> <source>Alt+M</source> <translation type="unfinished">Alt+M</translation> </message> @@ -42972,26 +44250,26 @@ <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="381"/> <source>...</source> - <translation type="unfinished">...</translation> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="66"/> + <source><b>Single character of a range (e.g. [abcd])</b><p>Select a single character of a range via a specific dialog.</p></source> + <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="69"/> - <source><b>Single character of a range (e.g. [abcd])</b><p>Select a single character of a range via a specific dialog.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="72"/> <source><b>Single character of a range (e.g. [abcd])</b><p>Select a single character of a range via a specific dialog. This dialog will help to edit the range of characters and add some specific conditions.</p>s</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="82"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="76"/> <source><b>Any character: '.'</b> <p>Select to insert a dot (.) in your regexp.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="86"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="80"/> <source><b>Any character: '.'</b> <p>Select to insert a dot (.) in your regexp. The dot matches a single character, except line break characters (by default). E.g. 'gr.y' matches 'gray', 'grey', 'gr%y', etc. Use the dot sparingly. Often, a character class or negated @@ -42999,19 +44277,19 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="103"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="94"/> <source><b>Repeat contents</b> <p>Select a repetition condition via a specific dialog. This dialog will help to specify the allowed range for repetitions.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="114"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="102"/> <source><b>Non capturing parentheses: (?:)</b> <p>Select to insert some non capturing brackets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="118"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="106"/> <source><b>Non capturing parentheses: (?:)</b> <p>Select to insert some non capturing brackets. It can be used to apply a regexp quantifier (eg. '?' or '+') to the entire group of characters inside the brakets. E.g. the regex 'Set(?:Value)?' matches 'Set' or 'SetValue'. The '?:' inside the brakets @@ -43019,13 +44297,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="131"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="116"/> <source><b>Atomic non capturing parentheses: (?>)</b> <p>Select to insert some atomic non capturing brackets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="135"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="120"/> <source><b>Atomic non capturing parentheses: (?>)</b> <p>Select to insert some atomic non capturing brackets. It can be used to apply a regexp quantifier (eg. '?' or '+') to the entire group of characters inside the brakets. E.g. the regex 'Set(?>Value)?' matches 'Set' or 'SetValue'. The '?>' inside the brakets @@ -43033,13 +44311,13 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="148"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="130"/> <source><b>Group: ()</b> <p>Select to insert some capturing brackets.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="152"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="134"/> <source><b>Group: ()</b> <p>Select to insert some capturing brackets. They can be used to apply a regexp quantifier (e.g. '?' or '+') to the entire group of characters inside the brakets. E.g. the regex 'Set(Value)?' matches 'Set' or 'SetValue'. Contrary to non-capturing parentheses, @@ -43049,14 +44327,14 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="167"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="146"/> <source><b>Named group: (?P&lt;<i>groupname</i>&gt;)</b> <p>Select to insert some named group brackets.</p></source> <translation type="unfinished"><b>Именованная группа: (?P&lt;<i>имя</i>&gt;)</b> <p>Вставить скобки именованной группы.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="171"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="150"/> <source><b>Named group: (?P&lt;<i>groupname</i>&gt;)</b> <p>Select to insert some named group brackets. Usage is similar to standard group parentheses as the matched backreference is also stored for further usage. The difference is that a name is given to the match. This is useful when @@ -43066,14 +44344,14 @@ <p>Вставить скобки именованной группы. Использование этой группы аналогично использованию стандартной группы. Отличие состоит в том, что обратной ссылке присваивается имя. Это полезно, когда работа с группами становится достаточно сложной. Доступ к обратной ссылке можно получить по имени (напр. (?P<foo>[abc])x(?P=foo)x(?P=foo)x совпадает с 'axaxax','bxbxbx' или 'cxcxcx' ('foo' — это имя группы)</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="185"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="161"/> <source><b>Reference named group: (?P=<i>groupname</i>)</b> <p>Select to insert a reference to named group previously declared.</p></source> <translation type="unfinished"><b>Ссылка на именованную группу: (?P=<i>имя</i>)</b> <p>Сослаться на предварительно объявленную именованную группу.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="189"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="165"/> <source><b>Reference named group: (?P=<i>groupname</i>)</b> <p>Select to insert a reference to named group previously declared. Each reference group refers to the match found by the corresponding named group. In the following example, (?P=foo) may refer to the charaters 'a','b' or 'c'.</p> @@ -43084,13 +44362,13 @@ <p>Напр. (?P<foo>[abc])x(?P=foo)x(?P=foo)x совпадает с 'axaxax','bxbxbx' или 'cxcxcx'.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="202"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="175"/> <source><b>Alternatives: '|'</b> <p>Select to insert the alternation symbol '|'. </p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="206"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="179"/> <source><b>Alternatives: '|'</b> <p>Select to insert the alternation symbol '|'. The alternation is used to match a single regular expression out of several possible regular expressions. E.g. 'cat|dog|mouse|fish' matches words containing the word 'cat', 'dog','mouse' or 'fish'. @@ -43099,78 +44377,78 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="220"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="190"/> <source><b>Begin of line: '^'</b> <p>Select to insert the start line character (^).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="224"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="194"/> <source><b>Begin of line: '^'</b> <p>Select to insert the start line character (^). It is used to find some expressions at the begining of lines. E.g. '^[A-Z]' match lines starting with a capitalized character. </p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="236"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="203"/> <source><b>End of line: '$'</b> <p>Select to insert the end of line character ($).</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="240"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="207"/> <source><b>End of line: '$'</b> <p>Select to insert the end of line character ($). It is used to find some expressions at the end of lines.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="251"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="215"/> <source><b>Word boundary</b> <p>Select to insert the word boudary character (\b).</p></source> <translation type="unfinished"></translation> </message> <message> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="219"/> + <source><b>Word boundary</b> +<p>Select to insert the word boudary character (\b). This character is used to express the fact that word +must begin or end at this position. E.g. '\bcat\b' matches exactly the word 'cat' while 'concatenation' is ignored.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="228"/> + <source><b>Non word boundary</b> +<p>Select to insert the word boudary character (\B). \B is the negated version of \b.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="232"/> + <source><b>Non word boundary</b> +<p>Select to insert the word boudary character (\B). \B is the negated version of \b. \B matches at every position where \b +does not. Effectively, \B matches at any position between two word characters as well as at any position between two non-word characters.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="241"/> + <source><b>Positive lookahead: (?=<i>regexpr</i>)</b> +<p>Select to insert the positive lookhead brackets.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="245"/> + <source><b>Positive lookahead: (?=<i>regexpr</i>)</b> +<p>Select to insert the positive lookhead brackets. Basically, positive lookhead is used to match a character only if followed by another one. +Writting 'q(?=u)' means that you want to match the 'q' character only if it is followed by 'u'. In this statement 'u' is a trivial +regexp which may be replaced by a more complex expression; q(?=[abc])' will match a 'q' if followed by either 'a', 'b' or 'c'.</p></source> + <translation type="unfinished"></translation> + </message> + <message> <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="255"/> - <source><b>Word boundary</b> -<p>Select to insert the word boudary character (\b). This character is used to express the fact that word -must begin or end at this position. E.g. '\bcat\b' matches exactly the word 'cat' while 'concatenation' is ignored.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="267"/> - <source><b>Non word boundary</b> -<p>Select to insert the word boudary character (\B). \B is the negated version of \b.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="271"/> - <source><b>Non word boundary</b> -<p>Select to insert the word boudary character (\B). \B is the negated version of \b. \B matches at every position where \b -does not. Effectively, \B matches at any position between two word characters as well as at any position between two non-word characters.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="283"/> - <source><b>Positive lookahead: (?=<i>regexpr</i>)</b> -<p>Select to insert the positive lookhead brackets.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="287"/> - <source><b>Positive lookahead: (?=<i>regexpr</i>)</b> -<p>Select to insert the positive lookhead brackets. Basically, positive lookhead is used to match a character only if followed by another one. -Writting 'q(?=u)' means that you want to match the 'q' character only if it is followed by 'u'. In this statement 'u' is a trivial -regexp which may be replaced by a more complex expression; q(?=[abc])' will match a 'q' if followed by either 'a', 'b' or 'c'.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="300"/> <source><b>Negative lookahead: (?!<i>regexpr</i>)</b> <p>Select to insert the negative lookhead brackets.</p></source> <translation type="unfinished"><b>Отрицательная предварительная проверка: (?=<i>regexpr</i>)</b><p>Вставить скобки отрицательной предварительной проверки.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="304"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="259"/> <source><b>Negative lookahead: (?!<i>regexpr</i>)</b> <p>Select to insert the negative lookhead brackets. Basically, negative lookhead is used to match a character only if it is not followed by a another one. Writting 'q(?!u)' means that you want to match 'q' only if it is not followed by 'u'. In this statement, 'u' is a @@ -43178,13 +44456,13 @@ <translation type="unfinished"><b>Отрицательная предварительная проверка: (?!<i>regexpr</i>)</b><p>Вставить скобки отрицательной предварительной проверки. В основном, отрицательная предварительная проверка используется для совпадения с символом, за которым не следует другой символВыражение 'q(?!u)' совпадает с символом 'q', только если за ним не следует символ 'u'. В этом примере, 'u' — это простейшее регулярное выражение, которое можно заменить на более сложное: q(?![abc])' совпадает с 'q', если за ним следует что угодно, кроме 'a', 'b' или 'c'.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="317"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="269"/> <source><b>Positive lookbehind: (?&lt;=<i>regexpr</i>)</b> <p>Select to insert the positive lookbehind brackets.</p></source> <translation type="unfinished"><b>Положительная ретроспективная проверка: (?&lt;=<i>regexpr</i>)</b><p>Вставить скобки положительной ретроспективной проверки.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="321"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="273"/> <source><b>Positive lookbehind: (?&lt;=<i>regexpr</i>)</b> <p>Select to insert the positive lookbehind brackets. Lookbehind has the same effect as lookahead, but works backwards. It is used to match a character only if preceded by another one. Writting '(?&lt;=u)q' means that you want to match the 'q' character @@ -43192,14 +44470,14 @@ <translation type="unfinished"><b>Положительная ретроспективная проверка: (?&lt;=<i>regexpr</i>)</b><p>Вставить скобки положительной ретроспективной проверки.</p>. Ретроспективная проверка работает аналогично предварительной, но в обратную сторону. Она используется, чтобы выразить совпадение с символом, если перед ним находится ещё один. Выражение '(?&lt;=u)q' совпадает с символом 'q', только если перед ним находится символ 'u'. Как и при предварительной проверке, 'u' можно заменить на более сложное регулярное выражение; '(?&lt;=[abc])q' совпадёт с 'q', если перед ней находится 'a', 'b' или 'c'.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="334"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="283"/> <source><b>Negative lookbehind (?&lt;!<i>regexpr</i>)</b> <p>Select to insert the negative lookbehind brackets.</p></source> <translation type="unfinished"><b>Отрицательная предварительная проверка: (?&lt;!<i>regexpr</i>)</b> <p>Вставить скобки отрицательной предварительной проверки.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="338"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="287"/> <source><b>Negative lookbehind (?&lt;!<i>regexpr</i>)</b> <p>Select to insert the negative lookbehind brackets. Lookbehind has the same effect as lookahead, but works backwards. It is used to match a character only if not preceded by another one. Writting '(?&lt;!u)q' means that you want to match the 'q' @@ -43209,72 +44487,72 @@ <p>Вставить скобки отрицательной ретроспективной проверки.</p>. Ретроспективная проверка работает аналогично предварительной, но в обратную сторону. Она используется, чтобы выразить совпадение с символом, если перед ним не находится ещё один. Выражение '(?&lt;!u)q' совпадает с символом 'q', только если перед ним не находится символ 'u'. Как и при предварительной проверке, 'u' можно заменить на более сложное регулярное выражение; '(?&lt;![abc])q' совпадёт с 'q', если перед ней находится всё, кроме 'a', 'b' или 'c'.</p></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="368"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="314"/> <source><b>Undo last edit</b></source> <translation type="unfinished"><b>Отменить последнее изменение</b></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="378"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="321"/> <source><b>Redo last edit</b></source> <translation type="unfinished"><b>Восстановить последнее отменённое изменение</b></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="408"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="348"/> <source>Regexp:</source> <translation type="unfinished">Регулярное выражение:</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="431"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="371"/> <source>Text:</source> <translation type="unfinished">Текст:</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="456"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="396"/> <source>Case Insensitive</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="463"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="403"/> <source>"^" matches beginning of line, "$" matches end of line</source> <translation type="unfinished">"^" - начало строки, "$" - конец строки</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="466"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="406"/> <source>Match Linebreaks</source> <translation type="unfinished">Включать переносы строк</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="473"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="413"/> <source>"." matches everything including linebreaks</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="476"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="416"/> <source>Dot matches everything</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="483"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="423"/> <source>Extended Pattern Syntax</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="490"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="430"/> <source>Inverted Greediness</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="497"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="437"/> <source>Unicode</source> <translation type="unfinished">Юникод</translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="504"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="444"/> <source>Non-named capturing groups do not capture substrings</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="507"/> + <location filename="../Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.ui" line="447"/> <source>Don't Capture</source> <translation type="unfinished"></translation> </message> @@ -43566,12 +44844,12 @@ <translation>Зарегистрированные документы</translation> </message> <message> - <location filename="../Helpviewer/QtHelpDocumentationDialog.ui" line="42"/> + <location filename="../Helpviewer/QtHelpDocumentationDialog.ui" line="48"/> <source>Add...</source> <translation>Добавить...</translation> </message> <message> - <location filename="../Helpviewer/QtHelpDocumentationDialog.ui" line="52"/> + <location filename="../Helpviewer/QtHelpDocumentationDialog.ui" line="58"/> <source>Remove</source> <translation>Удалить</translation> </message> @@ -43601,12 +44879,12 @@ <translation>Удалить документацию</translation> </message> <message> - <location filename="../Helpviewer/QtHelpDocumentationDialog.ui" line="39"/> + <location filename="../Helpviewer/QtHelpDocumentationDialog.ui" line="45"/> <source>Press to select QtHelp documents to add to the database</source> <translation>Добавить QtHelp документы в базу данных</translation> </message> <message> - <location filename="../Helpviewer/QtHelpDocumentationDialog.ui" line="49"/> + <location filename="../Helpviewer/QtHelpDocumentationDialog.ui" line="55"/> <source>Press to remove the selected documents from the database</source> <translation>Удалить подсвеченные документы из базы данных</translation> </message> @@ -43639,12 +44917,12 @@ <translation>Атрибуты:</translation> </message> <message> - <location filename="../Helpviewer/QtHelpFiltersDialog.ui" line="46"/> + <location filename="../Helpviewer/QtHelpFiltersDialog.ui" line="68"/> <source>1</source> <translation>1</translation> </message> <message> - <location filename="../Helpviewer/QtHelpFiltersDialog.ui" line="54"/> + <location filename="../Helpviewer/QtHelpFiltersDialog.ui" line="76"/> <source>Press to add a new filter</source> <translation>Добавить новый фильтр</translation> </message> @@ -43656,7 +44934,7 @@ <message> <location filename="../Helpviewer/QtHelpFiltersDialog.ui" line="64"/> <source>Press to remove the selected filter</source> - <translation>Удалить подсвеченный фильтр</translation> + <translation type="obsolete">Удалить подсвеченный фильтр</translation> </message> <message> <location filename="Helpviewer/QtHelpFiltersDialog.ui" line="63"/> @@ -43664,33 +44942,58 @@ <translation type="obsolete">Удалить</translation> </message> <message> - <location filename="../Helpviewer/QtHelpFiltersDialog.py" line="108"/> + <location filename="../Helpviewer/QtHelpFiltersDialog.py" line="128"/> <source>Add Filter</source> <translation>Добавить фильтр</translation> </message> <message> - <location filename="../Helpviewer/QtHelpFiltersDialog.py" line="108"/> + <location filename="../Helpviewer/QtHelpFiltersDialog.py" line="128"/> <source>Filter name:</source> <translation>Название фильтра:</translation> </message> <message> - <location filename="../Helpviewer/QtHelpFiltersDialog.ui" line="57"/> + <location filename="../Helpviewer/QtHelpFiltersDialog.ui" line="79"/> <source>Add Filter ...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Helpviewer/QtHelpFiltersDialog.ui" line="67"/> - <source>Remove Filter</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Helpviewer/QtHelpFiltersDialog.ui" line="74"/> - <source>Press to remove the selected attribute</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Helpviewer/QtHelpFiltersDialog.ui" line="77"/> - <source>Remove Attribute</source> + <location filename="../Helpviewer/QtHelpFiltersDialog.ui" line="86"/> + <source>Press to remove the selected filters</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Helpviewer/QtHelpFiltersDialog.py" line="148"/> + <source>Remove Filters</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Helpviewer/QtHelpFiltersDialog.ui" line="96"/> + <source>Press to remove the selected attributes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Helpviewer/QtHelpFiltersDialog.py" line="176"/> + <source>Remove Attributes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Helpviewer/QtHelpFiltersDialog.ui" line="106"/> + <source>Press to select all unused attributes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Helpviewer/QtHelpFiltersDialog.ui" line="109"/> + <source>Select Unused</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Helpviewer/QtHelpFiltersDialog.py" line="148"/> + <source>Do you really want to remove the selected filters from the database?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Helpviewer/QtHelpFiltersDialog.py" line="176"/> + <source>Do you really want to remove the selected attributes from the database?</source> <translation type="unfinished"></translation> </message> </context> @@ -43699,7 +45002,7 @@ <message> <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="46"/> <source>...</source> - <translation>...</translation> + <translation type="obsolete">...</translation> </message> <message> <location filename="Preferences/ConfigurationPages/QtPage.ui" line="70"/> @@ -43717,7 +45020,7 @@ <translation type="obsolete">Задайте путь для каталога переводов Qt4.</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.py" line="55"/> + <location filename="../Preferences/ConfigurationPages/QtPage.py" line="58"/> <source>Select Qt4 Translations Directory</source> <translation>Выберите каталог переводов Qt4</translation> </message> @@ -43727,7 +45030,7 @@ <translation><b>Настроить Qt</b></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="80"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="77"/> <source>Qt Tools</source> <translation>Утилиты Qt</translation> </message> @@ -43752,12 +45055,12 @@ <translation type="obsolete">Префикс Qt4:</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="130"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="127"/> <source>This gives an example of the complete tool name</source> <translation>Предпросмотр полного имени утилиты</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="133"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="130"/> <source>designer</source> <translation>designer</translation> </message> @@ -43772,7 +45075,7 @@ <translation type="obsolete">Каталог Qt4</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="60"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="50"/> <source><font color="#FF0000"><b>Note:</b> This setting is activated at the next startup of the application.</font></source> <translation><font color="#FF0000"><b>Примечание:</b> Эти изменения вступят в силу при следующем запуске приложения.</font></translation> </message> @@ -43792,7 +45095,7 @@ <translation type="obsolete">Выберите каталог Qt4</translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="86"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="83"/> <source>The tool executable is composed of the prefix, the tool name and the postfix. For win, the extension is added automatically.</source> <translation>Имя исполняемого файла для утилиты состоит из префикса, имени утилиты и постфикса. В win32 автоматически добавляется расширение.</translation> </message> @@ -43802,37 +45105,37 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="43"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="67"/> <source>Press to select the Qt translations directory via a directory selection dialog</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="53"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="43"/> <source>Enter the path of the Qt translations directory.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="67"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="57"/> <source><b>Note:</b> Leave this entry empty to use the QT4TRANSLATIONSDIR environment variable or the path compiled into the Qt library.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="96"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="93"/> <source>Qt-Prefix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="103"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="100"/> <source>Enter the prefix for the Qt tools name</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="110"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="107"/> <source>Qt-Postfix:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="117"/> + <location filename="../Preferences/ConfigurationPages/QtPage.ui" line="114"/> <source>Enter the postfix for the Qt tools name</source> <translation type="unfinished"></translation> </message> @@ -43840,182 +45143,182 @@ <context> <name>Queues</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="274"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="262"/> <source>New Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="324"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="311"/> <source>Update Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="380"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="366"/> <source>Pop Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="370"/> <source>Push Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="388"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="374"/> <source>Go to Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="507"/> <source>Select Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="400"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="386"/> <source>Select the target patch name:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="524"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="507"/> <source>No patches to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="438"/> <source>Finish Applied Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="487"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="471"/> <source>Rename Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="510"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="493"/> <source>Select the patch to be deleted:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="519"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="502"/> <source>Delete Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="568"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="550"/> <source>Fold Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="563"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="545"/> <source>No patches selected.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="568"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="550"/> <source>No patches available to be folded.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="577"/> <source>List Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="595"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="577"/> <source>No patches available to list guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="633"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="615"/> <source>Define Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="679"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="660"/> <source>No patches available to define guards for.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="679"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="660"/> <source>Drop All Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="654"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="636"/> <source>Select the patch to drop guards for (leave empty for the current patch):</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="716"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> <source>Set Active Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="716"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="696"/> <source>No guards available to select from.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="739"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="718"/> <source>Deactivate Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="779"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="758"/> <source>Create New Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="781"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="760"/> <source>Rename Active Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="819"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="795"/> <source>Error while creating a new queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="822"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="798"/> <source>Error while renaming the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="851"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="827"/> <source>Purge Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="853"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="829"/> <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="855"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="831"/> <source>Activate Queue</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="896"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="869"/> <source>Error while purging the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="898"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="871"/> <source>Error while deleting the queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="900"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="873"/> <source>Error while setting the active queue.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="926"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="899"/> <source>Available Queues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="950"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py" line="922"/> <source>Initializing new queue repository</source> <translation type="unfinished"></translation> </message> @@ -44188,187 +45491,187 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="346"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="361"/> <source>Push Next Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="238"/> - <source>Push the next patch onto the stack</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="241"/> - <source><b>Push Next Patch</b><p>This pushes the next patch onto the stack of applied patches.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="362"/> - <source>Push All Patches</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="253"/> - <source>Push all patches onto the stack</source> + <source>Push the next patch onto the stack</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="256"/> + <source><b>Push Next Patch</b><p>This pushes the next patch onto the stack of applied patches.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="377"/> + <source>Push All Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="268"/> + <source>Push all patches onto the stack</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="271"/> <source><b>Push All Patches</b><p>This pushes all patches onto the stack of applied patches.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="378"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="393"/> <source>Push Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="269"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="284"/> <source>Push patches onto the stack</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="395"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="410"/> <source>Pop Current Patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="285"/> - <source>Pop the current patch off the stack</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="288"/> - <source><b>Pop Current Patch</b><p>This pops the current patch off the stack of applied patches.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="412"/> - <source>Pop All Patches</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="300"/> - <source>Pop all patches off the stack</source> + <source>Pop the current patch off the stack</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="303"/> + <source><b>Pop Current Patch</b><p>This pops the current patch off the stack of applied patches.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="427"/> + <source>Pop All Patches</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="315"/> + <source>Pop all patches off the stack</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="318"/> <source><b>Pop All Patches</b><p>This pops all patches off the stack of applied patches.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="428"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="443"/> <source>Pop Patches</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="316"/> - <source>Pop patches off the stack</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="319"/> - <source><b>Pop Patches</b><p>This pops patches off the stack of applied patches until a named patch is at the top of the stack.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="445"/> - <source>Go to Patch</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="331"/> - <source>Push or pop patches until named patch is at top of stack</source> + <source>Pop patches off the stack</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="334"/> + <source><b>Pop Patches</b><p>This pops patches off the stack of applied patches until a named patch is at the top of the stack.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="460"/> + <source>Go to Patch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="346"/> + <source>Push or pop patches until named patch is at top of stack</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="349"/> <source><b>Go to Patch</b><p>This pushes or pops patches until a named patch is at the top of the stack.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="350"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="365"/> <source>Push the next patch onto the stack on top of local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="353"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="368"/> <source><b>Push Next Patch</b><p>This pushes the next patch onto the stack of applied patches on top of local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="366"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="381"/> <source>Push all patches onto the stack on top of local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="369"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="384"/> <source><b>Push All Patches</b><p>This pushes all patches onto the stack of applied patches on top of local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="382"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="397"/> <source>Push patches onto the stack on top of local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="385"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="400"/> <source><b>Push Patches</b><p>This pushes patches onto the stack of applied patches until a named patch is at the top of the stack on top of local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="399"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="414"/> <source>Pop the current patch off the stack forgetting local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="402"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="417"/> <source><b>Pop Current Patch</b><p>This pops the current patch off the stack of applied patches forgetting local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="416"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="431"/> <source>Pop all patches off the stack forgetting local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="419"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="434"/> <source><b>Pop All Patches</b><p>This pops all patches off the stack of applied patches forgetting local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="432"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="447"/> <source>Pop patches off the stack forgetting local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="435"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="450"/> <source><b>Pop Patches</b><p>This pops patches off the stack of applied patches until a named patch is at the top of the stack forgetting local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="449"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="464"/> <source>Push or pop patches until named patch is at top of stack overwriting any local changes</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="453"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="468"/> <source><b>Go to Patch</b><p>This pushes or pops patches until a named patch is at the top of the stack overwriting any local changes.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="761"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="777"/> <source>Queues</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="678"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="693"/> <source>Push/Pop</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="690"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="705"/> <source>Push/Pop (force)</source> <translation type="unfinished"></translation> </message> @@ -44378,262 +45681,262 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="272"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="287"/> <source><b>Push Patches</b><p>This pushes patches onto the stack of applied patches until a named patch is at the top of the stack.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="481"/> <source>Define Guards</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="466"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="481"/> <source>Define Guards...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="470"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="485"/> <source>Define guards for the current or a named patch</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="473"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="488"/> <source><b>Define Guards</b><p>This opens a dialog to define guards for the current or a named patch.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="482"/> - <source>Drop All Guards</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="482"/> - <source>Drop All Guards...</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="486"/> - <source>Drop all guards of the current or a named patch</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="489"/> - <source><b>Drop All Guards</b><p>This drops all guards of the current or a named patch.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="497"/> - <source>List Guards</source> + <source>Drop All Guards</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="497"/> - <source>List Guards...</source> + <source>Drop All Guards...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="501"/> - <source>List guards of the current or a named patch</source> + <source>Drop all guards of the current or a named patch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="504"/> - <source><b>List Guards</b><p>This lists the guards of the current or a named patch.</p></source> + <source><b>Drop All Guards</b><p>This drops all guards of the current or a named patch.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="512"/> - <source>List All Guards</source> + <source>List Guards</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="512"/> - <source>List All Guards...</source> + <source>List Guards...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="516"/> - <source>List all guards of all patches</source> + <source>List guards of the current or a named patch</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="519"/> - <source><b>List All Guards</b><p>This lists all guards of all patches.</p></source> + <source><b>List Guards</b><p>This lists the guards of the current or a named patch.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="527"/> - <source>Set Active Guards</source> + <source>List All Guards</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="527"/> - <source>Set Active Guards...</source> + <source>List All Guards...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="531"/> - <source>Set the list of active guards</source> + <source>List all guards of all patches</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="534"/> - <source><b>Set Active Guards</b><p>This opens a dialog to set the active guards.</p></source> + <source><b>List All Guards</b><p>This lists all guards of all patches.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="542"/> - <source>Deactivate Guards</source> + <source>Set Active Guards</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="542"/> - <source>Deactivate Guards...</source> + <source>Set Active Guards...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="546"/> - <source>Deactivate all active guards</source> + <source>Set the list of active guards</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="549"/> - <source><b>Deactivate Guards</b><p>This deactivates all active guards.</p></source> + <source><b>Set Active Guards</b><p>This opens a dialog to set the active guards.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="557"/> + <source>Deactivate Guards</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="557"/> - <source>Identify Active Guards</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="557"/> - <source>Identify Active Guards...</source> + <source>Deactivate Guards...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="561"/> - <source>Show a list of active guards</source> + <source>Deactivate all active guards</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="564"/> - <source><b>Identify Active Guards</b><p>This opens a dialog showing a list of active guards.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="702"/> - <source>Guards</source> + <source><b>Deactivate Guards</b><p>This deactivates all active guards.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="572"/> + <source>Identify Active Guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="572"/> + <source>Identify Active Guards...</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="576"/> - <source>Create Queue</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="580"/> - <source>Create a new patch queue</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="583"/> - <source><b>Create Queue</b><p>This creates a new patch queue.</p></source> + <source>Show a list of active guards</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="579"/> + <source><b>Identify Active Guards</b><p>This opens a dialog showing a list of active guards.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="717"/> + <source>Guards</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="591"/> - <source>Rename Queue</source> + <source>Create Queue</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="595"/> - <source>Rename the active patch queue</source> + <source>Create a new patch queue</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="598"/> - <source><b>Rename Queue</b><p>This renames the active patch queue.</p></source> + <source><b>Create Queue</b><p>This creates a new patch queue.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="606"/> - <source>Delete Queue</source> + <source>Rename Queue</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="610"/> - <source>Delete the reference to a patch queue</source> + <source>Rename the active patch queue</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="613"/> - <source><b>Delete Queue</b><p>This deletes the reference to a patch queue.</p></source> + <source><b>Rename Queue</b><p>This renames the active patch queue.</p></source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="621"/> - <source>Purge Queue</source> + <source>Delete Queue</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="625"/> + <source>Delete the reference to a patch queue</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="628"/> + <source><b>Delete Queue</b><p>This deletes the reference to a patch queue.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="636"/> + <source>Purge Queue</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="640"/> <source>Delete the reference to a patch queue and remove the patch directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="629"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="644"/> <source><b>Purge Queue</b><p>This deletes the reference to a patch queue and removes the patch directory.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="638"/> - <source>Activate Queue</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="642"/> - <source>Set the active queue</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="645"/> - <source><b>Activate Queue</b><p>This sets the active queue.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="653"/> - <source>List Queues</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="653"/> - <source>List Queues...</source> + <source>Activate Queue</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="657"/> - <source>List the available queues</source> + <source>Set the active queue</source> <translation type="unfinished"></translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="660"/> + <source><b>Activate Queue</b><p>This sets the active queue.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="668"/> + <source>List Queues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="668"/> + <source>List Queues...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="672"/> + <source>List the available queues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="675"/> <source><b>List Queues</b><p>This opens a dialog showing all available queues.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="715"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="730"/> <source>Queue Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="833"/> <source>The project should be reread. Do this now?</source> <translation type="unfinished">Необходимо перезагрузить проект. Сделать это?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="817"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="833"/> <source>Changing Applied Patches</source> <translation type="unfinished"></translation> </message> @@ -44692,21 +45995,41 @@ <source><b>Show Status</b><p>This shows the status of the queue repository.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="225"/> + <source>Show Summary</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="225"/> + <source>Show summary...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="229"/> + <source>Show summary information of the queue repository</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/QueuesExtension/ProjectHelper.py" line="232"/> + <source><b>Show summary</b><p>This shows some summary information of the queue repository.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Rebase</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="80"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="79"/> <source>Rebase Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="107"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="105"/> <source>Rebase Changesets (Continue)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="134"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py" line="131"/> <source>Rebase Changesets (Abort)</source> <translation type="unfinished"></translation> </message> @@ -45042,7 +46365,7 @@ <translation>Подсвечивать всё</translation> </message> <message> - <location filename="../UI/SearchWidget.py" line="177"/> + <location filename="../UI/SearchWidget.py" line="180"/> <source>'{0}' was not found.</source> <translation type="unfinished">'{0}' не найдено.</translation> </message> @@ -45201,7 +46524,7 @@ <translation>Переинициализировать и очистить</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1557"/> + <location filename="../QScintilla/Shell.py" line="1568"/> <source>Drop Error</source> <translation>Ошибка Drag&&Drop</translation> </message> @@ -45211,7 +46534,7 @@ <translation>Нет.</translation> </message> <message> - <location filename="../QScintilla/Shell.py" line="1557"/> + <location filename="../QScintilla/Shell.py" line="1568"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> не является файлом</p></translation> </message> @@ -45490,6 +46813,225 @@ </message> </context> <context> + <name>Shelve</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="122"/> + <source>Shelve current changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="172"/> + <source>Restore shelved changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="197"/> + <source>Abort restore operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="224"/> + <source>Continue restore operation</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="248"/> + <source>Select the shelves to be deleted:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="268"/> + <source>Delete shelves</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="258"/> + <source>Do you really want to delete these shelves?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="294"/> + <source>Delete all shelves</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py" line="286"/> + <source>Do you really want to delete all shelved changes?</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ShelveProjectBrowserHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="58"/> + <source>Shelve changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="114"/> + <source>Shelve</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectBrowserHelper.py" line="93"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Необходимо перезагрузить проект. Сделать это?</translation> + </message> +</context> +<context> + <name>ShelveProjectHelper</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="32"/> + <source>Shelve changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="32"/> + <source>Shelve changes...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="36"/> + <source>Shelve all current changes of the project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="39"/> + <source><b>Shelve changes</b><p>This shelves all current changes of the project.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="46"/> + <source>Show shelve browser</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="46"/> + <source>Show shelve browser...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="50"/> + <source>Show a dialog with all shelves</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="53"/> + <source><b>Show shelve browser...</b><p>This shows a dialog listing all available shelves. Actions on these shelves may be executed via the context menu.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="63"/> + <source>Restore shelved change</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="63"/> + <source>Restore shelved change...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="67"/> + <source>Restore a shelved change to the project directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="70"/> + <source><b>Restore shelved change</b><p>This restore a shelved change to the project directory.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="78"/> + <source>Abort restore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="78"/> + <source>Abort restore...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="82"/> + <source>Abort the restore operation in progress</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="85"/> + <source><b>Abort restore</b><p>This aborts the restore operation in progress and reverts already applied changes.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="93"/> + <source>Continue restore</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="93"/> + <source>Continue restore...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="97"/> + <source>Continue the restore operation in progress</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="100"/> + <source><b>Continue restore</b><p>This continues the restore operation in progress.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="108"/> + <source>Delete shelved changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="108"/> + <source>Delete shelved changes...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="112"/> + <source><b>Delete shelved changes...</b><p>This opens a dialog to select the shelved changes to delete and deletes the selected ones.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="121"/> + <source>Delete ALL shelved changes</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="125"/> + <source><b>Delete ALL shelved changes</b><p>This deletes all shelved changes.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="187"/> + <source>Shelve</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="173"/> + <source>The project should be reread. Do this now?</source> + <translation type="unfinished">Необходимо перезагрузить проект. Сделать это?</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="202"/> + <source>Unshelve</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="210"/> + <source>Abort Unshelve</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/ShelveExtension/ProjectHelper.py" line="218"/> + <source>Continue Unshelve</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> <name>ShortcutDialog</name> <message> <location filename="../Preferences/ShortcutDialog.ui" line="14"/> @@ -46369,72 +47911,72 @@ <context> <name>SpellingPropertiesDialog</name> <message> - <location filename="../Project/SpellingPropertiesDialog.ui" line="22"/> + <location filename="../Project/SpellingPropertiesDialog.ui" line="23"/> <source>Project &Language:</source> <translation>&Язык проекта:</translation> </message> <message> - <location filename="../Project/SpellingPropertiesDialog.ui" line="32"/> + <location filename="../Project/SpellingPropertiesDialog.ui" line="33"/> <source>Select the project's language</source> <translation>Задайте язык проекта</translation> </message> <message> - <location filename="../Project/SpellingPropertiesDialog.ui" line="39"/> + <location filename="../Project/SpellingPropertiesDialog.ui" line="40"/> <source>Project &Word List:</source> <translation>Список &слов проекта:</translation> </message> <message> - <location filename="../Project/SpellingPropertiesDialog.ui" line="49"/> + <location filename="../Project/SpellingPropertiesDialog.ui" line="50"/> <source>Enter the filename of the project word list</source> <translation>Введите файл списка слов проекта</translation> </message> <message> - <location filename="../Project/SpellingPropertiesDialog.ui" line="56"/> + <location filename="../Project/SpellingPropertiesDialog.ui" line="97"/> <source>Select the project word list file via a file selection dialog</source> <translation>Задайте файл списка слов проекта с помощью диалога выбора файлов</translation> </message> <message> <location filename="../Project/SpellingPropertiesDialog.ui" line="86"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Project/SpellingPropertiesDialog.ui" line="66"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Project/SpellingPropertiesDialog.ui" line="57"/> <source>Project E&xclude List:</source> <translation>Список &исключений проекта:</translation> </message> <message> - <location filename="../Project/SpellingPropertiesDialog.ui" line="76"/> + <location filename="../Project/SpellingPropertiesDialog.ui" line="67"/> <source>Enter the filename of the project exclude list</source> <translation>Введите файл исключений проекта</translation> </message> <message> - <location filename="../Project/SpellingPropertiesDialog.ui" line="83"/> + <location filename="../Project/SpellingPropertiesDialog.ui" line="104"/> <source>Select the project exclude list file via a file selection dialog</source> <translation>Введите файл исключений проекта с помощью диалога выбора файлов</translation> </message> <message> - <location filename="../Project/SpellingPropertiesDialog.py" line="46"/> + <location filename="../Project/SpellingPropertiesDialog.py" line="50"/> <source><default></source> <translation><По умолчанию></translation> </message> <message> - <location filename="../Project/SpellingPropertiesDialog.py" line="80"/> + <location filename="../Project/SpellingPropertiesDialog.py" line="87"/> <source>Select project word list</source> <translation>Выберите список слов проекта</translation> </message> <message> - <location filename="../Project/SpellingPropertiesDialog.py" line="101"/> + <location filename="../Project/SpellingPropertiesDialog.py" line="108"/> <source>Dictionary File (*.dic);;All Files (*)</source> <translation>Файл словаря (*.dic);Все файлы (*)</translation> </message> <message> - <location filename="../Project/SpellingPropertiesDialog.py" line="101"/> + <location filename="../Project/SpellingPropertiesDialog.py" line="108"/> <source>Select project exclude list</source> <translation>Выберите список исключений проекта</translation> </message> <message> - <location filename="../Project/SpellingPropertiesDialog.ui" line="13"/> + <location filename="../Project/SpellingPropertiesDialog.ui" line="14"/> <source>Spelling Properties</source> <translation>Настройка проверки орфографии</translation> </message> @@ -46689,62 +48231,62 @@ <translation>Введите имя базы данных</translation> </message> <message> - <location filename="../SqlBrowser/SqlConnectionDialog.ui" line="75"/> + <location filename="../SqlBrowser/SqlConnectionDialog.ui" line="155"/> <source>Press to select a database file</source> <translation>Выбрать файл базы данных</translation> </message> <message> <location filename="../SqlBrowser/SqlConnectionDialog.ui" line="78"/> <source>...</source> - <translation>...</translation> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../SqlBrowser/SqlConnectionDialog.ui" line="75"/> + <source>&Username:</source> + <translation>&Имя пользователя:</translation> </message> <message> <location filename="../SqlBrowser/SqlConnectionDialog.ui" line="85"/> - <source>&Username:</source> - <translation>&Имя пользователя:</translation> - </message> - <message> - <location filename="../SqlBrowser/SqlConnectionDialog.ui" line="95"/> <source>Enter the user name</source> <translation>Введите имя пользователя</translation> </message> <message> - <location filename="../SqlBrowser/SqlConnectionDialog.ui" line="102"/> + <location filename="../SqlBrowser/SqlConnectionDialog.ui" line="92"/> <source>&Password:</source> <translation>&Пароль:</translation> </message> <message> + <location filename="../SqlBrowser/SqlConnectionDialog.ui" line="109"/> + <source>&Hostname:</source> + <translation>Имя &сервера:</translation> + </message> + <message> <location filename="../SqlBrowser/SqlConnectionDialog.ui" line="119"/> - <source>&Hostname:</source> - <translation>Имя &сервера:</translation> - </message> - <message> - <location filename="../SqlBrowser/SqlConnectionDialog.ui" line="129"/> <source>Enter the hostname</source> <translation>Введите имя сервера</translation> </message> <message> + <location filename="../SqlBrowser/SqlConnectionDialog.ui" line="126"/> + <source>P&ort:</source> + <translation>П&орт:</translation> + </message> + <message> <location filename="../SqlBrowser/SqlConnectionDialog.ui" line="136"/> - <source>P&ort:</source> - <translation>П&орт:</translation> - </message> - <message> - <location filename="../SqlBrowser/SqlConnectionDialog.ui" line="146"/> <source>Enter the port number</source> <translation>Введите номер порта</translation> </message> <message> - <location filename="../SqlBrowser/SqlConnectionDialog.ui" line="149"/> + <location filename="../SqlBrowser/SqlConnectionDialog.ui" line="139"/> <source>Default</source> <translation>По умолчанию</translation> </message> <message> - <location filename="../SqlBrowser/SqlConnectionDialog.py" line="98"/> + <location filename="../SqlBrowser/SqlConnectionDialog.py" line="104"/> <source>Select Database File</source> <translation>Выбрать файл базы данных</translation> </message> <message> - <location filename="../SqlBrowser/SqlConnectionDialog.py" line="98"/> + <location filename="../SqlBrowser/SqlConnectionDialog.py" line="104"/> <source>All Files (*)</source> <translation>Все файлы (*)</translation> </message> @@ -47092,12 +48634,12 @@ <translation>&Рабочий каталог:</translation> </message> <message> - <location filename="../Debugger/StartCoverageDialog.ui" line="107"/> + <location filename="../Debugger/StartCoverageDialog.ui" line="227"/> <source>Select directory using a directory selection dialog</source> <translation>Выберите каталог с помощью диалога</translation> </message> <message> - <location filename="../Debugger/StartCoverageDialog.ui" line="110"/> + <location filename="../Debugger/StartCoverageDialog.ui" line="230"/> <source><b>Select directory</b> <p>Select the working directory via a directory selection dialog.</p></source> <translation><b>Выбор каталога</b> @@ -47106,7 +48648,7 @@ <message> <location filename="../Debugger/StartCoverageDialog.ui" line="114"/> <source>...</source> - <translation>...</translation> + <translation type="obsolete">...</translation> </message> <message> <location filename="../Debugger/StartCoverageDialog.ui" line="81"/> @@ -47122,76 +48664,76 @@ Оставьте пустым, чтобы использовать каталог, в котором находится исполняемый файл.</p></translation> </message> <message> - <location filename="../Debugger/StartCoverageDialog.ui" line="121"/> + <location filename="../Debugger/StartCoverageDialog.ui" line="107"/> <source>&Environment:</source> <translation>Переменные &окружения:</translation> </message> <message> - <location filename="../Debugger/StartCoverageDialog.ui" line="137"/> + <location filename="../Debugger/StartCoverageDialog.ui" line="123"/> <source>Enter the environment variables to be set.</source> <translation>Задайте, какие переменные окружения надо установить.</translation> </message> <message> - <location filename="../Debugger/StartCoverageDialog.ui" line="164"/> + <location filename="../Debugger/StartCoverageDialog.ui" line="150"/> <source>Uncheck to disable exception reporting</source> <translation>Снимите пометку, чтобы запретить перехват исключений</translation> </message> <message> - <location filename="../Debugger/StartCoverageDialog.ui" line="167"/> + <location filename="../Debugger/StartCoverageDialog.ui" line="153"/> <source><b>Report exceptions</b> <p>Uncheck this in order to disable exception reporting.</p></source> <translation><b>Перехватывать исключения</b> <p>Отключите, чтобы исключения не перехватывались</p></translation> </message> <message> - <location filename="../Debugger/StartCoverageDialog.ui" line="171"/> + <location filename="../Debugger/StartCoverageDialog.ui" line="157"/> <source>Report &exceptions</source> <translation>Перехватывать &исключения</translation> </message> <message> - <location filename="../Debugger/StartCoverageDialog.ui" line="174"/> + <location filename="../Debugger/StartCoverageDialog.ui" line="160"/> <source>Alt+E</source> <translation>Alt+E</translation> </message> <message> - <location filename="../Debugger/StartCoverageDialog.ui" line="214"/> + <location filename="../Debugger/StartCoverageDialog.ui" line="200"/> <source>Select this to erase the collected coverage information</source> <translation>Выберите, чтобы удалить информацию охвата</translation> </message> <message> - <location filename="../Debugger/StartCoverageDialog.ui" line="217"/> + <location filename="../Debugger/StartCoverageDialog.ui" line="203"/> <source><b>Erase coverage information</b> <p>Select this to erase the collected coverage information before the next coverage run.</p></source> <translation><b>Стереть информацию охвата</b> <p>Выберите, чтобы удалить информацию охвата перед следующим охватывающим выполнением.</p></translation> </message> <message> - <location filename="../Debugger/StartCoverageDialog.ui" line="221"/> + <location filename="../Debugger/StartCoverageDialog.ui" line="207"/> <source>Erase &coverage information</source> <translation>&Удалить информацию охвата</translation> </message> <message> - <location filename="../Debugger/StartCoverageDialog.ui" line="224"/> + <location filename="../Debugger/StartCoverageDialog.ui" line="210"/> <source>Alt+C</source> <translation>Alt+C</translation> </message> <message> - <location filename="../Debugger/StartCoverageDialog.ui" line="184"/> + <location filename="../Debugger/StartCoverageDialog.ui" line="170"/> <source>Select to clear the display of the interpreter window</source> <translation>Очистить окно интерпретатора</translation> </message> <message> - <location filename="../Debugger/StartCoverageDialog.ui" line="187"/> + <location filename="../Debugger/StartCoverageDialog.ui" line="173"/> <source><b>Clear interpreter window</b><p>This clears the display of the interpreter window before starting the debug client.</p></source> <translation><b>Очистить окно интерпретатора</b><p>Перед начало отладки окно интерпретатора очищается.</p></translation> </message> <message> - <location filename="../Debugger/StartCoverageDialog.ui" line="190"/> + <location filename="../Debugger/StartCoverageDialog.ui" line="176"/> <source>Clear &interpreter window</source> <translation>Очистить окно &интерпретатора</translation> </message> <message> - <location filename="../Debugger/StartCoverageDialog.ui" line="140"/> + <location filename="../Debugger/StartCoverageDialog.ui" line="126"/> <source><b>Environment</b> <p>Enter the environment variables to be set for the program. The individual settings must be separated by whitespace and be given in the form 'var=value'. In order to add to an environment variable, enter it in the form 'var+=value'.</p> <p>Example: var1=1 var2="hello world" var3+=":/tmp"</p></source> @@ -47200,19 +48742,19 @@ <p>Например: var1=1 var2="hello world" var3+=":/tmp"</p></translation> </message> <message> - <location filename="../Debugger/StartCoverageDialog.ui" line="200"/> + <location filename="../Debugger/StartCoverageDialog.ui" line="186"/> <source>Select to start the debugger in a console window</source> <translation>Запустить отладчик в окне консоли</translation> </message> <message> - <location filename="../Debugger/StartCoverageDialog.ui" line="203"/> + <location filename="../Debugger/StartCoverageDialog.ui" line="189"/> <source><b>Start in console</b> <p>Select to start the debugger in a console window. The console command has to be configured on the Debugger-&gt;General page</p></source> <translation><b>Запустить в окне консоли</b> <p>Запустить отладчик в окне консоли. Консоль для отладчика должна быть сконфигурирована в настройках отладчика -&gt;General page</p></translation> </message> <message> - <location filename="../Debugger/StartCoverageDialog.ui" line="207"/> + <location filename="../Debugger/StartCoverageDialog.ui" line="193"/> <source>Start in console</source> <translation>Запустить в окне консоли</translation> </message> @@ -47247,12 +48789,12 @@ <translation>&Рабочий каталог:</translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="107"/> + <location filename="../Debugger/StartDebugDialog.ui" line="279"/> <source>Select directory using a directory selection dialog</source> <translation>Выберите каталог с помощью диалога</translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="110"/> + <location filename="../Debugger/StartDebugDialog.ui" line="282"/> <source><b>Select directory</b> <p>Select the working directory via a directory selection dialog.</p></source> <translation><b>Выбор каталога</b> @@ -47261,7 +48803,7 @@ <message> <location filename="../Debugger/StartDebugDialog.ui" line="114"/> <source>...</source> - <translation>...</translation> + <translation type="obsolete">...</translation> </message> <message> <location filename="../Debugger/StartDebugDialog.ui" line="81"/> @@ -47277,130 +48819,130 @@ Оставьте пустым, чтобы использовать каталог, в котором находится исполняемый файл.</p></translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="121"/> + <location filename="../Debugger/StartDebugDialog.ui" line="107"/> <source>&Environment:</source> <translation>Переменные &окружения:</translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="137"/> + <location filename="../Debugger/StartDebugDialog.ui" line="123"/> <source>Enter the environment variables to be set.</source> <translation>Задайте, какие переменные окружения надо установить.</translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="164"/> + <location filename="../Debugger/StartDebugDialog.ui" line="150"/> <source>Uncheck to disable exception reporting</source> <translation>Снимите пометку, чтобы запретить перехват исключений</translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="167"/> + <location filename="../Debugger/StartDebugDialog.ui" line="153"/> <source><b>Report exceptions</b> <p>Uncheck this in order to disable exception reporting.</p></source> <translation><b>Перехватывать исключения</b> <p>Отключите, чтобы исключения не перехватывались</p></translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="171"/> + <location filename="../Debugger/StartDebugDialog.ui" line="157"/> <source>Report &exceptions</source> <translation>Перехватывать &исключения</translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="174"/> + <location filename="../Debugger/StartDebugDialog.ui" line="160"/> <source>Alt+E</source> <translation>Alt+E</translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="214"/> + <location filename="../Debugger/StartDebugDialog.ui" line="200"/> <source>Select to trace into the Python library</source> <translation>Заходить при отладке в стандартные функции Python</translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="217"/> + <location filename="../Debugger/StartDebugDialog.ui" line="203"/> <source>&Trace into interpreter libraries</source> <translation>&Заходить при отладке в стандартные библиотеки</translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="220"/> + <location filename="../Debugger/StartDebugDialog.ui" line="206"/> <source>Alt+T</source> <translation>Alt+T</translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="227"/> + <location filename="../Debugger/StartDebugDialog.ui" line="213"/> <source>Select to not stop the debugger at the first executable line.</source> <translation>Поставьте пометку, чтобы не останавливать отладчик на первой исполняемой строчке.</translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="230"/> + <location filename="../Debugger/StartDebugDialog.ui" line="216"/> <source><b>Don't stop at first line</b><p>This prevents the debugger from stopping at the first executable line.</p></source> <translation><b>Не останавливаться на первой строчке</b><p>Отменяет остановку отладчика на первой исполняемой строчке.</p></translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="233"/> + <location filename="../Debugger/StartDebugDialog.ui" line="219"/> <source>Don't stop at first line</source> <translation>Don't stop at first line</translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="184"/> + <location filename="../Debugger/StartDebugDialog.ui" line="170"/> <source>Select to clear the display of the interpreter window</source> <translation>Очистить окно интерпретатора</translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="187"/> + <location filename="../Debugger/StartDebugDialog.ui" line="173"/> <source><b>Clear interpreter window</b><p>This clears the display of the interpreter window before starting the debug client.</p></source> <translation><b>Очистить окно интерпретатора</b><p>Перед начало отладки окно интерпретатора очищается.</p></translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="190"/> + <location filename="../Debugger/StartDebugDialog.ui" line="176"/> <source>Clear &interpreter window</source> <translation>Очистить окно &интерпретатора</translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="140"/> + <location filename="../Debugger/StartDebugDialog.ui" line="126"/> <source><b>Environment</b> <p>Enter the environment variables to be set for the program. The individual settings must be separated by whitespace and be given in the form 'var=value'. In order to add to an environment variable, enter it in the form 'var+=value'.</p> <p>Example: var1=1 var2="hello world" var3+=":/tmp"</p></source> <translation><b>Переменные окружения</b><p>Задайте, какие прееменные окружения надо установить для программы. Значения должны разделяться пробелами и быть вида 'var=value'. Чтобы добавить значенние к переменной окружения, используйте форму 'var+=value'</p><p>Например: var1=1 var2="hello world" var3+=":/tmp"</p></translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="200"/> + <location filename="../Debugger/StartDebugDialog.ui" line="186"/> <source>Select to start the debugger in a console window</source> <translation>Запустить отладчик в окне консоли</translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="203"/> + <location filename="../Debugger/StartDebugDialog.ui" line="189"/> <source><b>Start in console</b> <p>Select to start the debugger in a console window. The console command has to be configured on the Debugger-&gt;General page</p></source> <translation><b>Запустить в окне консоли</b> <p>Запустить отладчик в окне консоли. Консоль для отладчика должна быть сконфигурирована в настройках отладчика -&gt;General page</p></translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="207"/> + <location filename="../Debugger/StartDebugDialog.ui" line="193"/> <source>Start in console</source> <translation>Запустить в окне консоли</translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="243"/> + <location filename="../Debugger/StartDebugDialog.ui" line="229"/> <source>Forking</source> <translation>Форк</translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="249"/> + <location filename="../Debugger/StartDebugDialog.ui" line="235"/> <source>Select to go through the fork without asking</source> <translation>Форк без подтверждения</translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="252"/> + <location filename="../Debugger/StartDebugDialog.ui" line="238"/> <source><b>Fork without pausing</b> <p>Select to go through the fork without asking making the forking decision based on the Parent/Child selection.</p></source> <translation><b>Форк без остановки</b> <p>Проходить через форк не запрашивая подтверждения.</p></translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="256"/> + <location filename="../Debugger/StartDebugDialog.ui" line="242"/> <source>Fork without pausing</source> <translation>Форк без отановки</translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="266"/> + <location filename="../Debugger/StartDebugDialog.ui" line="252"/> <source>Select to debug the child process after forking</source> <translation>После форка отлаживать дочерний процесс</translation> </message> @@ -47410,14 +48952,14 @@ <translation type="obsolete">Отлаживать дочерний процесс</translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="269"/> + <location filename="../Debugger/StartDebugDialog.ui" line="255"/> <source><b>Debug Child Process</b> <p>Select to debug the child process after forking. If it is not selected, the parent process will be debugged. This has no effect, if forking without pausing is not selected.</p></source> <translation><b>Отлаживать дочерний процесс</b> <p>После форка отлаживать дочерний процесс. Если эта опция не выбрана, то будет отлаживаться родительский процесс. Действительна только в случае если выбрана опция "Форк без отановки".</p></translation> </message> <message> - <location filename="../Debugger/StartDebugDialog.ui" line="273"/> + <location filename="../Debugger/StartDebugDialog.ui" line="259"/> <source>Follow Child Process</source> <translation type="unfinished"></translation> </message> @@ -47425,12 +48967,12 @@ <context> <name>StartDialog</name> <message> - <location filename="../Debugger/StartDialog.py" line="123"/> + <location filename="../Debugger/StartDialog.py" line="128"/> <source>Working directory</source> <translation>Рабочий каталог</translation> </message> <message> - <location filename="../Debugger/StartDialog.py" line="79"/> + <location filename="../Debugger/StartDialog.py" line="81"/> <source>Clear Histories</source> <translation>Очистить истории</translation> </message> @@ -47443,25 +48985,25 @@ <translation>Начать профилирование</translation> </message> <message> - <location filename="../Debugger/StartProfileDialog.ui" line="214"/> + <location filename="../Debugger/StartProfileDialog.ui" line="200"/> <source>Select this to erase the collected timing data</source> <translation>Выберите, чтобы удалить информацию о времени выполнения</translation> </message> <message> - <location filename="../Debugger/StartProfileDialog.ui" line="217"/> + <location filename="../Debugger/StartProfileDialog.ui" line="203"/> <source><b>Erase timing data</b> <p>Select this to erase the collected timing data before the next profiling run.</p></source> <translation><b>Стереть информацию о времени выполнения</b> <p>Выберите, чтобы удалить информацию о времени выполнения перед следующим профилированием.</p></translation> </message> <message> - <location filename="../Debugger/StartProfileDialog.ui" line="221"/> + <location filename="../Debugger/StartProfileDialog.ui" line="207"/> <source>Erase &timing data</source> <translation> &Удалить информацию времени выполнения</translation> </message> <message> - <location filename="../Debugger/StartProfileDialog.ui" line="224"/> + <location filename="../Debugger/StartProfileDialog.ui" line="210"/> <source>Alt+C</source> <translation>Alt+C</translation> </message> @@ -47488,12 +49030,12 @@ <translation>&Рабочий каталог:</translation> </message> <message> - <location filename="../Debugger/StartProfileDialog.ui" line="107"/> + <location filename="../Debugger/StartProfileDialog.ui" line="227"/> <source>Select directory using a directory selection dialog</source> <translation>Выберите каталог с помощью диалога</translation> </message> <message> - <location filename="../Debugger/StartProfileDialog.ui" line="110"/> + <location filename="../Debugger/StartProfileDialog.ui" line="230"/> <source><b>Select directory</b> <p>Select the working directory via a directory selection dialog.</p></source> <translation><b>Выбор каталога</b> @@ -47502,7 +49044,7 @@ <message> <location filename="../Debugger/StartProfileDialog.ui" line="114"/> <source>...</source> - <translation>...</translation> + <translation type="obsolete">...</translation> </message> <message> <location filename="../Debugger/StartProfileDialog.ui" line="81"/> @@ -47518,73 +49060,73 @@ Оставьте пустым, чтобы использовать каталог, в котором находится исполняемый файл.</p></translation> </message> <message> - <location filename="../Debugger/StartProfileDialog.ui" line="121"/> + <location filename="../Debugger/StartProfileDialog.ui" line="107"/> <source>&Environment:</source> <translation>Переменные &окружения:</translation> </message> <message> - <location filename="../Debugger/StartProfileDialog.ui" line="137"/> + <location filename="../Debugger/StartProfileDialog.ui" line="123"/> <source>Enter the environment variables to be set.</source> <translation>Задайте, какие переменные окружения надо установить.</translation> </message> <message> - <location filename="../Debugger/StartProfileDialog.ui" line="164"/> + <location filename="../Debugger/StartProfileDialog.ui" line="150"/> <source>Uncheck to disable exception reporting</source> <translation>Снимите пометку, чтобы запретить перехват исключений</translation> </message> <message> - <location filename="../Debugger/StartProfileDialog.ui" line="167"/> + <location filename="../Debugger/StartProfileDialog.ui" line="153"/> <source><b>Report exceptions</b> <p>Uncheck this in order to disable exception reporting.</p></source> <translation><b>Перехватывать исключения</b> <p>Отключите, чтобы исключения не перехватывались</p></translation> </message> <message> - <location filename="../Debugger/StartProfileDialog.ui" line="171"/> + <location filename="../Debugger/StartProfileDialog.ui" line="157"/> <source>Report &exceptions</source> <translation>Перехватывать &исключения</translation> </message> <message> - <location filename="../Debugger/StartProfileDialog.ui" line="174"/> + <location filename="../Debugger/StartProfileDialog.ui" line="160"/> <source>Alt+E</source> <translation>Alt+E</translation> </message> <message> - <location filename="../Debugger/StartProfileDialog.ui" line="184"/> + <location filename="../Debugger/StartProfileDialog.ui" line="170"/> <source>Select to clear the display of the interpreter window</source> <translation>Очистить окно интерпретатора</translation> </message> <message> - <location filename="../Debugger/StartProfileDialog.ui" line="187"/> + <location filename="../Debugger/StartProfileDialog.ui" line="173"/> <source><b>Clear interpreter window</b><p>This clears the display of the interpreter window before starting the debug client.</p></source> <translation><b>Очистить окно интерпретатора</b><p>Перед начало отладки окно интерпретатора очищается.</p></translation> </message> <message> - <location filename="../Debugger/StartProfileDialog.ui" line="190"/> + <location filename="../Debugger/StartProfileDialog.ui" line="176"/> <source>Clear &interpreter window</source> <translation>Очистить окно &интерпретатора</translation> </message> <message> - <location filename="../Debugger/StartProfileDialog.ui" line="140"/> + <location filename="../Debugger/StartProfileDialog.ui" line="126"/> <source><b>Environment</b> <p>Enter the environment variables to be set for the program. The individual settings must be separated by whitespace and be given in the form 'var=value'. In order to add to an environment variable, enter it in the form 'var+=value'.</p> <p>Example: var1=1 var2="hello world" var3+=":/tmp"</p></source> <translation><b>Переменные окружения</b><p>Задайте, какие прееменные окружения надо установить для программы. Значения должны разделяться пробелами и быть вида 'var=value'. Чтобы добавить значенние к переменной окружения, используйте форму 'var+=value'</p><p>Например: var1=1 var2="hello world" var3+=":/tmp"</p></translation> </message> <message> - <location filename="../Debugger/StartProfileDialog.ui" line="200"/> + <location filename="../Debugger/StartProfileDialog.ui" line="186"/> <source>Select to start the debugger in a console window</source> <translation>Запустить отладчик в окне консоли</translation> </message> <message> - <location filename="../Debugger/StartProfileDialog.ui" line="203"/> + <location filename="../Debugger/StartProfileDialog.ui" line="189"/> <source><b>Start in console</b> <p>Select to start the debugger in a console window. The console command has to be configured on the Debugger-&gt;General page</p></source> <translation><b>Запустить в окне консоли</b> <p>Запустить отладчик в окне консоли. Консоль для отладчика должна быть сконфигурирована в настройках отладчика -&gt;General page</p></translation> </message> <message> - <location filename="../Debugger/StartProfileDialog.ui" line="207"/> + <location filename="../Debugger/StartProfileDialog.ui" line="193"/> <source>Start in console</source> <translation>Запустить в окне консоли</translation> </message> @@ -47597,34 +49139,34 @@ <translation>Запустить на выполнение</translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="164"/> + <location filename="../Debugger/StartRunDialog.ui" line="150"/> <source>Uncheck to disable exception reporting</source> <translation>Снимите пометку, чтобы запретить перехват исключений</translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="167"/> + <location filename="../Debugger/StartRunDialog.ui" line="153"/> <source><b>Report exceptions</b> <p>Uncheck this in order to disable exception reporting.</p></source> <translation><b>Перехватывать исключения</b> <p>Отключите, чтобы исключения не перехватывались</p></translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="171"/> + <location filename="../Debugger/StartRunDialog.ui" line="157"/> <source>Report &exceptions</source> <translation>Перехватывать &исключения</translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="174"/> + <location filename="../Debugger/StartRunDialog.ui" line="160"/> <source>Alt+E</source> <translation>Alt+E</translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="137"/> + <location filename="../Debugger/StartRunDialog.ui" line="123"/> <source>Enter the environment variables to be set.</source> <translation>Задайте, какие переменные окружения надо установить.</translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="121"/> + <location filename="../Debugger/StartRunDialog.ui" line="107"/> <source>&Environment:</source> <translation>Переменные &окружения:</translation> </message> @@ -47642,12 +49184,12 @@ Оставьте пустым, чтобы использовать каталог, в котором находится исполняемый файл.</p></translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="107"/> + <location filename="../Debugger/StartRunDialog.ui" line="250"/> <source>Select directory using a directory selection dialog</source> <translation>Выберите каталог с помощью диалога</translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="110"/> + <location filename="../Debugger/StartRunDialog.ui" line="253"/> <source><b>Select directory</b> <p>Select the working directory via a directory selection dialog.</p></source> <translation><b>Выбор каталога</b> @@ -47656,7 +49198,7 @@ <message> <location filename="../Debugger/StartRunDialog.ui" line="114"/> <source>...</source> - <translation>...</translation> + <translation type="obsolete">...</translation> </message> <message> <location filename="../Debugger/StartRunDialog.ui" line="65"/> @@ -47681,73 +49223,73 @@ <translation>&Командная строка:</translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="184"/> + <location filename="../Debugger/StartRunDialog.ui" line="170"/> <source>Select to clear the display of the interpreter window</source> <translation>Очистить окно интерпретатора</translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="187"/> + <location filename="../Debugger/StartRunDialog.ui" line="173"/> <source><b>Clear interpreter window</b><p>This clears the display of the interpreter window before starting the debug client.</p></source> <translation><b>Очистить окно интерпретатора</b><p>Перед начало отладки окно интерпретатора очищается.</p></translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="190"/> + <location filename="../Debugger/StartRunDialog.ui" line="176"/> <source>Clear &interpreter window</source> <translation>Очистить окно &интерпретатора</translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="140"/> + <location filename="../Debugger/StartRunDialog.ui" line="126"/> <source><b>Environment</b> <p>Enter the environment variables to be set for the program. The individual settings must be separated by whitespace and be given in the form 'var=value'. In order to add to an environment variable, enter it in the form 'var+=value'.</p> <p>Example: var1=1 var2="hello world" var3+=":/tmp"</p></source> <translation><b>Переменные окружения</b><p>Задайте, какие прееменные окружения надо установить для программы. Значения должны разделяться пробелами и быть вида 'var=value'. Чтобы добавить значенние к переменной окружения, используйте форму 'var+=value'</p><p>Например: var1=1 var2="hello world" var3+=":/tmp"</p></translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="200"/> + <location filename="../Debugger/StartRunDialog.ui" line="186"/> <source>Select to start the debugger in a console window</source> <translation>Запустить отладчик в окне консоли</translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="203"/> + <location filename="../Debugger/StartRunDialog.ui" line="189"/> <source><b>Start in console</b> <p>Select to start the debugger in a console window. The console command has to be configured on the Debugger-&gt;General page</p></source> <translation><b>Запустить в окне консоли</b> <p>Запустить отладчик в окне консоли. Консоль для отладчика должна быть сконфигурирована в настройках отладчика -&gt;General page</p></translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="207"/> + <location filename="../Debugger/StartRunDialog.ui" line="193"/> <source>Start in console</source> <translation>Запустить в окне консоли</translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="214"/> + <location filename="../Debugger/StartRunDialog.ui" line="200"/> <source>Forking</source> <translation>Форк</translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="220"/> + <location filename="../Debugger/StartRunDialog.ui" line="206"/> <source>Select to go through the fork without asking</source> <translation>Форк без подтверждения</translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="223"/> + <location filename="../Debugger/StartRunDialog.ui" line="209"/> <source><b>Fork without pausing</b> <p>Select to go through the fork without asking making the forking decision based on the Parent/Child selection.</p></source> <translation><b>Форк без остановки</b> <p>Проходить через форк не запрашивая подтверждения.</p></translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="227"/> + <location filename="../Debugger/StartRunDialog.ui" line="213"/> <source>Fork without pausing</source> <translation>Форк без отановки</translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="237"/> + <location filename="../Debugger/StartRunDialog.ui" line="223"/> <source>Select to debug the child process after forking</source> <translation>После форка отлаживать дочерний процесс</translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="240"/> + <location filename="../Debugger/StartRunDialog.ui" line="226"/> <source><b>Debug Child Process</b> <p>Select to debug the child process after forking. If it is not selected, the parent process will be debugged. This has no effect, if forking without pausing is not selected.</p></source> <translation><b>Отлаживать дочерний процесс</b> @@ -47759,7 +49301,7 @@ <translation type="obsolete">Отлаживать дочерний процесс</translation> </message> <message> - <location filename="../Debugger/StartRunDialog.ui" line="244"/> + <location filename="../Debugger/StartRunDialog.ui" line="230"/> <source>Follow Child Process</source> <translation type="unfinished"></translation> </message> @@ -47767,42 +49309,42 @@ <context> <name>StatusMonitorLed</name> <message> - <location filename="../VCS/StatusMonitorLed.py" line="45"/> + <location filename="../VCS/StatusMonitorLed.py" line="47"/> <source><p>This LED indicates the operating status of the VCS monitor thread (off = monitoring off, green = monitoring on and ok, red = monitoring on, but not ok, yellow = checking VCS status). A status description is given in the tooltip.</p></source> <translation><p>Этот индикатор отображает оперативный статус потока мониторинга VCS(выключен - мониторинг выключен, зелёный - мониторинг включен и работает в штатном режиме, красный - мониторинг включен и произошла ошибка, жёлтый - проверяется статуc VCS). Описание статуса дано во всплывающей подсказке.</p></translation> </message> <message> - <location filename="../VCS/StatusMonitorLed.py" line="52"/> + <location filename="../VCS/StatusMonitorLed.py" line="54"/> <source>Repository status checking is switched off</source> <translation>Проверка статуса репозитория отключена</translation> </message> <message> - <location filename="../VCS/StatusMonitorLed.py" line="59"/> - <source>Check status</source> - <translation>Проверить статус</translation> - </message> - <message> <location filename="../VCS/StatusMonitorLed.py" line="61"/> + <source>Check status</source> + <translation>Проверить статус</translation> + </message> + <message> + <location filename="../VCS/StatusMonitorLed.py" line="63"/> <source>Set interval...</source> <translation>Установить интервал...</translation> </message> <message> - <location filename="../VCS/StatusMonitorLed.py" line="126"/> + <location filename="../VCS/StatusMonitorLed.py" line="130"/> <source>VCS Status Monitor</source> <translation>Монитор статуса VCS</translation> </message> <message> - <location filename="../VCS/StatusMonitorLed.py" line="126"/> + <location filename="../VCS/StatusMonitorLed.py" line="130"/> <source>Enter monitor interval [s]</source> <translation>Задайте интервал мониторинга (в сек)</translation> </message> <message> - <location filename="../VCS/StatusMonitorLed.py" line="64"/> - <source>Switch on</source> - <translation>Включить</translation> - </message> - <message> <location filename="../VCS/StatusMonitorLed.py" line="66"/> + <source>Switch on</source> + <translation>Включить</translation> + </message> + <message> + <location filename="../VCS/StatusMonitorLed.py" line="68"/> <source>Switch off</source> <translation>Выключить</translation> </message> @@ -47915,7 +49457,7 @@ <translation>Удалить свойство Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1774"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1777"/> <source>Enter property name</source> <translation>Задайте имя свойства</translation> </message> @@ -47985,12 +49527,12 @@ <translation>Задайте количество элементов для отображения.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2260"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2261"/> <source>Locking in the Subversion repository</source> <translation>Захватываю файл/каталог в репозитории Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2300"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2301"/> <source>Unlocking in the Subversion repository</source> <translation>Освобождаю файл/каталог в репозитории Subversion</translation> </message> @@ -48016,17 +49558,17 @@ <translation>Свойство удалено.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2240"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2241"/> <source>Subversion Lock</source> <translation>Запереть</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2240"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2241"/> <source>Enter lock comment</source> <translation>Задайте комментарий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2348"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2349"/> <source>Relocating</source> <translation>Перемещаю</translation> </message> @@ -48187,42 +49729,42 @@ <translation>Импортирована ревизия {0}.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="175"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="178"/> <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="1963"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1966"/> <source>The svn process did not finish within 30s.</source> <translation>Процесс svn не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="182"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="185"/> <source>Could not start the svn executable.</source> <translation>Невозможно запустить исполняемый файл svn.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2374"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2375"/> <source>Repository Browser</source> <translation>Проводник репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2374"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2375"/> <source>Enter the repository URL.</source> <translation>Задайте URL репозитория.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2399"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2400"/> <source>Remove from changelist</source> <translation>Удалить из списка изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2436"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2437"/> <source>Add to changelist</source> <translation>Добавить к списку изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2425"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2426"/> <source>Enter name of the changelist:</source> <translation>Введите имя списка изменений:</translation> </message> @@ -48272,7 +49814,7 @@ <translation type="obsolete">Процесс hg не завершился в течение 30 секунд.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1966"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1969"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation type="unfinished"></translation> </message> @@ -48287,7 +49829,7 @@ <translation type="unfinished"><p>Невозможно прочитать файл: <b>{0}</b></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2495"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/subversion.py" line="2496"/> <source>Upgrade</source> <translation type="unfinished"></translation> </message> @@ -48476,12 +50018,12 @@ <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="94"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py" line="94"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> @@ -48579,7 +50121,7 @@ <context> <name>SvnCommandDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="70"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.py" line="76"/> <source>Working directory</source> <translation>Рабочий каталог</translation> </message> @@ -48594,12 +50136,12 @@ <translation>Команда Subversion:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="64"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="131"/> <source>Select the working directory via a directory selection dialog</source> <translation>Задайте рабочий каталог с помощью диалога выбора каталога</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="67"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="134"/> <source><b>Working directory</b> <p>Select the working directory for the Subversion command via a directory selection dialog.</p></source> <translation><b>Рабочий каталог</b> @@ -48608,15 +50150,15 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="71"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="84"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="70"/> <source>Enter the working directory for the Subversion command</source> <translation>Задайте рабочий каталог для команды Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="87"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="73"/> <source><b>Working directory</b> <p>Enter the working directory for the Subversion command. This is an optional entry. The button to the right will open a @@ -48627,22 +50169,22 @@ его с помощью диалога, нажав кнопку справа.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="109"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="95"/> <source>Working Directory:<br>(optional)</source> <translation>Рабочий каталог:<br>(опционально)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="122"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="108"/> <source>Project Directory:</source> <translation>Каталог проекта:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="135"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="121"/> <source>This shows the root directory of the current project.</source> <translation>Корневой каталог текущего проекта.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="138"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCommandDialog.ui" line="124"/> <source>project directory</source> <translation>каталог проекта</translation> </message> @@ -48727,12 +50269,12 @@ <context> <name>SvnCopyDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="47"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="50"/> <source>Subversion Move</source> <translation>Перемещение Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.py" line="89"/> <source>Select target</source> <translation>Выберите цель</translation> </message> @@ -48742,12 +50284,12 @@ <translation>Копия Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="25"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="64"/> <source>Press to open a selection dialog</source> <translation>Нажмите, чтобы открыть диалог выбора</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.ui" line="28"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnCopyDialog.ui" line="67"/> <source><b>Target directory</b> <p>Select the target name for the operation via a selection dialog.</p></source> <translation><b>Каталог назначенияy</b> @@ -48756,27 +50298,27 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="32"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="39"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="25"/> <source>Source:</source> <translation>Откуда:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="46"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="32"/> <source>Shows the name of the source</source> <translation>Имя источника</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="49"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="35"/> <source><b>Source name</b> <p>This field shows the name of the source.</p></source> <translation><b>Откуда</b> <p>Это поле показывает имя источника.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="60"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="46"/> <source>Enter the target name</source> <translation>Задайте имя приёмника</translation> </message> @@ -48788,28 +50330,28 @@ <p>В этом поле задайте новое мия.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="57"/> <source>Target:</source> <translation>Куда:</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="77"/> + <source>Select to force the operation</source> + <translation>Выполнить операцию принудительно</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="80"/> - <source>Select to force the operation</source> - <translation>Выполнить операцию принудительно</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="83"/> <source>Enforce operation</source> <translation>Выполнить принудительно</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="28"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="67"/> <source><b>Target name</b> <p>Select the target name for the operation via a selection dialog.</p></source> <translation><b>Назначение</b><p>Выберите имя назначения с помощью диалога выбора.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="63"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnCopyDialog.ui" line="49"/> <source><b>Target name</b> <p>Enter the new name in this field. The target must be the new name or an absolute path.</p></source> <translation type="unfinished"></translation> @@ -49200,213 +50742,213 @@ <translation>Журнал Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="576"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="613"/> <source>Revision</source> <translation>Версия (ревизия)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="573"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="610"/> <source>Author</source> <translation>Автор</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="122"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="57"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="133"/> <source>Message</source> <translation>Сообщение</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="173"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="170"/> <source>Action</source> <translation>Действие</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="178"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="175"/> <source>Path</source> <translation>Путь</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="183"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="180"/> <source>Copy from</source> <translation>Копировать из</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="188"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="185"/> <source>Copy from Rev</source> <translation>Копировать из версии</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="195"/> + <source>Press to get the next bunch of log entries</source> + <translation>Нажмите для получения следующей части сообщений журнала</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="198"/> - <source>Press to get the next bunch of log entries</source> - <translation>Нажмите для получения следующей части сообщений журнала</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="201"/> <source>&Next</source> <translation>&Далее</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="208"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="205"/> <source>Enter the limit of entries to fetch</source> <translation>Задайте максимальное количество записей</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="241"/> + <source>Press to generate a diff to the previous revision</source> + <translation>Создания сравнение с предыдущей версией</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="244"/> - <source>Press to generate a diff to the previous revision</source> - <translation>Создания сравнение с предыдущей версией</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="247"/> <source>&Diff to Previous</source> <translation>&Сравнить с предыдущей</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="251"/> + <source>Press to compare two revisions</source> + <translation>Нажмите, чтобы сравнить две версии</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="254"/> - <source>Press to compare two revisions</source> - <translation>Нажмите, чтобы сравнить две версии</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="257"/> <source>&Compare Revisions</source> <translation>&Сравнить версии</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="92"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="82"/> <source>Added</source> <translation>Добавлено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="93"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="83"/> <source>Deleted</source> <translation>Удалено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="84"/> <source>Modified</source> <translation>Изменено</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="452"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnLogBrowserDialog.py" line="495"/> <source>Subversion Error</source> <translation>Ошибка Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="295"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="292"/> <source>Errors</source> <translation>Ошибки</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="301"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="298"/> <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="317"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="314"/> <source>Input</source> <translation>Ввод</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="336"/> + <source>Press to send the input to the subversion process</source> + <translation>Отправить данные процессу subversion</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="339"/> - <source>Press to send the input to the subversion process</source> - <translation>Отправить данные процессу subversion</translation> + <source>&Send</source> + <translation>&Отправить</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="342"/> - <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"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="349"/> <source>Enter data to be sent to the subversion process</source> <translation>Задайте данные, которые будут посланы процессу subversion</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="356"/> + <source>Select to switch the input field to password mode</source> + <translation>Задать режим ввода пароля для поля ввода пароля</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> + <source>&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="365"/> <source>Alt+P</source> <translation>Alt+P</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="281"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="253"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="281"/> <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/vcsSubversion/SvnLogBrowserDialog.ui" line="25"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="22"/> <source>From:</source> <translation>От:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="32"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="29"/> <source>Enter the start date</source> <translation>Задайте начальную дату</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="42"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="39"/> <source>To:</source> <translation>До:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="49"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="46"/> <source>Enter the end date</source> <translation>Задайте конечную дату</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="59"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="56"/> <source>Select the field to filter on</source> <translation>Задайте поле, по которому фильтровать</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="81"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="78"/> <source>Enter the regular expression to filter on</source> <translation>Задайте регулярное выражения для фильтра</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="224"/> + <source>Select to stop listing log messages at a copy or move</source> + <translation>Выберите для приостановки пролистывания сообщений журнала при копировании или перемещении</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="227"/> - <source>Select to stop listing log messages at a copy or move</source> - <translation>Выберите для приостановки пролистывания сообщений журнала при копировании или перемещении</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="230"/> <source>Stop on Copy/Move</source> <translation>Стоп при копировании/перемещении</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="95"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="85"/> <source>Replaced</source> <translation>Заменено</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="274"/> + <source>Select to show differences side-by-side</source> + <translation type="unfinished"></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> @@ -49660,12 +51202,12 @@ <context> <name>SvnNewProjectOptionsDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="66"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="93"/> <source>Select Repository-Directory</source> <translation>Задайте каталог репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="94"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="121"/> <source>Select Project Directory</source> <translation>Выберите каталог проекта</translation> </message> @@ -49698,30 +51240,30 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="119"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="51"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="41"/> <source>Select the protocol to access the repository</source> <translation>Задайте протокол доступа к репозиторию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="58"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="48"/> <source>&Protocol:</source> <translation>&Протокол:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="131"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="158"/> <source>&URL:</source> <translation>&URL:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="88"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="78"/> <source>Enter the directory of the new project.</source> <translation>Задайте каталог нового проекта.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="91"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="81"/> <source><b>Project Directory</b> <p>Enter the directory of the new project. It will be retrieved from the repository and be placed in this directory.</p></source> @@ -49729,37 +51271,37 @@ <p>Задайте каталог проекта. Он будет добыт из репозитория и сложен в этот каталог.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="100"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="90"/> <source>Select to indicate, that the repository has a standard layout (projectdir/trunk, projectdir/tags, projectdir/branches)</source> <translation>Репозиторий находится в стандартном виде (каталог_проекта/trunk, каталог_проекта/tags, каталог_проекта/branches)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="103"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="93"/> <source>Repository has standard &layout</source> <translation>Репозиторий имеет стандартный &вид</translation> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="96"/> + <source>Alt+L</source> + <translation>Alt+L</translation> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="106"/> - <source>Alt+L</source> - <translation>Alt+L</translation> + <source>Project &Directory:</source> + <translation>&Каталог проекта:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="116"/> + <source>&Tag:</source> + <translation>&Тег:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="133"/> + <source>Select the project directory via a directory selection dialog</source> + <translation>Задайте каталог проекта с помощью диалога выбора каталога</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="126"/> - <source>Project &Directory:</source> - <translation>&Каталог проекта:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="136"/> - <source>&Tag:</source> - <translation>&Тег:</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="41"/> - <source>Select the project directory via a directory selection dialog</source> - <translation>Задайте каталог проекта с помощью диалога выбора каталога</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="116"/> <source>Select the repository url via a directory selection dialog or the repository browser</source> <translation>Задайте URL репозитория с помощью диалога выбора каталога или проводника репозитория</translation> </message> @@ -49769,18 +51311,18 @@ <translation type="obsolete">Задайте путь URL модуля в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="71"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="61"/> <source><b>URL</b><p>Enter the URL to the module. For a repository with standard layout, this must not contain the trunk, tags or branches part.</p></source> <translation><b>URL</b> <p>Задайте URL модуля. Для репозитория со стандартным расположением файлов, путь не должен содержать части trunk, tags или branches.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="125"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py" line="152"/> <source>Pat&h:</source> <translation>Пут&ь:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="68"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.ui" line="58"/> <source>Enter the url path of the module in the repository (without protocol part)</source> <translation type="unfinished"></translation> </message> @@ -49788,7 +51330,7 @@ <context> <name>SvnOptionsDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py" line="63"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py" line="69"/> <source>Select Repository-Directory</source> <translation>Задайте каталог репозитория</translation> </message> @@ -49834,37 +51376,37 @@ <message> <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui" line="66"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py" line="102"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py" line="108"/> <source>&URL:</source> <translation>&URL:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui" line="83"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui" line="73"/> <source>Enter the log message for the new project.</source> <translation>Задайте сообщение в журнал о создании нового проекта.</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui" line="86"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui" line="76"/> <source><b>Log Message</b> <p>Enter the log message to be used for the new project.</p></source> <translation><b>Сообщение в журнал</b> <p>Задайте сообщение в журнал для текущего проекта.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui" line="90"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui" line="80"/> <source>new project started</source> <translation>Начат новый проект</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui" line="97"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui" line="87"/> <source>&Protocol:</source> <translation>&Протокол:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui" line="63"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui" line="107"/> <source>Select the repository url via a directory selection dialog or the repository browser</source> <translation>Задайте URL репозитория с помощью диалога выбора каталога или проводника репозитория</translation> </message> @@ -49874,17 +51416,17 @@ <translation type="obsolete">Задайте путь URL модуля в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui" line="110"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui" line="100"/> <source><b>URL</b><p>Enter the URL to the module. For a repository with standard layout, this must not contain the trunk, tags or branches part.</p></source> <translation><b>URL</b><p>Задайте URL модуля. Для репозитория со стандартным расположением файлов, путь не должен содержать части trunk, tags или branches.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py" line="102"/> <source>Pat&h:</source> <translation>Пут&ь:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui" line="107"/> + <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.ui" line="97"/> <source>Enter the url path of the module in the repository (without protocol part)</source> <translation type="unfinished"></translation> </message> @@ -50838,7 +52380,7 @@ <context> <name>SvnPropSetDialog</name> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py" line="41"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.py" line="44"/> <source>Select file for property</source> <translation><b>Диаграмма</b> <p>Эта канва используется для отображения выбранной диаграммы. Для управления @@ -50860,7 +52402,7 @@ <translation>Установить свойство Subversion</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.ui" line="24"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.ui" line="25"/> <source>Property Name:</source> <translation>Имя свойства:</translation> </message> @@ -50870,17 +52412,17 @@ <translation>Задайте имя устанавливаемого свойства</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.ui" line="40"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.ui" line="41"/> <source>Select property source</source> <translation>Укажите источник свойства</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.ui" line="49"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.ui" line="50"/> <source>File</source> <translation>Файл</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.ui" line="56"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.ui" line="57"/> <source>Text</source> <translation>Текст</translation> </message> @@ -50890,17 +52432,17 @@ <translation>Задайте текст свойства</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.ui" line="82"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.ui" line="93"/> <source>Press to select the file via a file selection dialog</source> <translation>Выберите файл с помощью файлового диалога</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.ui" line="85"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.ui" line="95"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnPropSetDialog.ui" line="83"/> <source>Enter the name of a file for the property</source> <translation>Задайте имя файла для свойства</translation> </message> @@ -53147,12 +54689,12 @@ <translation>Символы</translation> </message> <message> - <location filename="../UI/SymbolsWidget.ui" line="85"/> + <location filename="../UI/SymbolsWidget.ui" line="82"/> <source>Symbol code:</source> <translation>Код символа:</translation> </message> <message> - <location filename="../UI/SymbolsWidget.ui" line="92"/> + <location filename="../UI/SymbolsWidget.ui" line="89"/> <source>Enter the symbol code</source> <translation>Введите код символа</translation> </message> @@ -53358,10 +54900,10 @@ <message> <location filename="../Helpviewer/Sync/SyncDirectorySettingsPage.ui" line="49"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Helpviewer/Sync/SyncDirectorySettingsPage.py" line="67"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Helpviewer/Sync/SyncDirectorySettingsPage.py" line="70"/> <source>Shared Directory</source> <translation type="unfinished"></translation> </message> @@ -53801,7 +55343,7 @@ <translation>Показать все файлы, содержащие синтаксические ошибки</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="292"/> + <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="304"/> <source>No issues found.</source> <translation>Синтаксисические ошибки не найдены.</translation> </message> @@ -53831,7 +55373,7 @@ <translation>Начать</translation> </message> <message> - <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="204"/> + <location filename="../Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py" line="205"/> <source>Error: {0}</source> <translation>Ошибка: {0}</translation> </message> @@ -53872,252 +55414,252 @@ <translation><нет перевода></translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="60"/> + <location filename="../Tools/TRPreviewer.py" line="59"/> <source>Translations Previewer</source> <translation>Предпросмотр переводов</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="83"/> + <location filename="../Tools/TRPreviewer.py" line="82"/> <source>Select language file</source> <translation>Выберите файл языка</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="158"/> + <location filename="../Tools/TRPreviewer.py" line="157"/> <source>&Open UI Files...</source> <translation>&Открыть файлы UI...</translation> </message> <message> + <location filename="../Tools/TRPreviewer.py" line="160"/> + <source>Open UI files for display</source> + <translation>Открыть для просмотра файлы UI (описаний пользовательского интерфейса)</translation> + </message> + <message> <location filename="../Tools/TRPreviewer.py" line="161"/> - <source>Open UI files for display</source> - <translation>Открыть для просмотра файлы UI (описаний пользовательского интерфейса)</translation> - </message> - <message> - <location filename="../Tools/TRPreviewer.py" line="162"/> <source><b>Open UI Files</b><p>This opens some UI files for display.</p></source> <translation><b>Открыть файлы UI</b><p>Открыть для просмотра несколько файлов UI (описаний пользовательского интерфейса).</p></translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="168"/> + <location filename="../Tools/TRPreviewer.py" line="167"/> <source>Open &Translation Files...</source> <translation>Открыть файлы &переводов...</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="171"/> + <location filename="../Tools/TRPreviewer.py" line="170"/> <source>Open Translation files for display</source> <translation>Открыть для просмотра файлы переводов</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="173"/> + <location filename="../Tools/TRPreviewer.py" line="172"/> <source><b>Open Translation Files</b><p>This opens some translation files for display.</p></source> <translation><b>Открыть файлы переводов</b><p>Открыть для просмотра несколько файлов переводов.</p></translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="182"/> + <location filename="../Tools/TRPreviewer.py" line="181"/> <source>Reload the loaded translations</source> <translation>Перезагрузить загруженные переводы</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="184"/> + <location filename="../Tools/TRPreviewer.py" line="183"/> <source><b>Reload Translations</b><p>This reloads the translations for the loaded languages.</p></source> <translation><b>Перезагрузить переводы</b><p>Перезагрузить переводы загруженных языков.</p></translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="191"/> + <location filename="../Tools/TRPreviewer.py" line="190"/> <source>&Quit</source> <translation>&Выход</translation> </message> <message> + <location filename="../Tools/TRPreviewer.py" line="194"/> + <source>Quit the application</source> + <translation>Выйти из приложения</translation> + </message> + <message> <location filename="../Tools/TRPreviewer.py" line="195"/> - <source>Quit the application</source> - <translation>Выйти из приложения</translation> - </message> - <message> - <location filename="../Tools/TRPreviewer.py" line="196"/> <source><b>Quit</b><p>Quit the application.</p></source> <translation><b>Выход</b><p>Выйти из приложения.</p></translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="202"/> + <location filename="../Tools/TRPreviewer.py" line="201"/> <source>&What's This?</source> <translation>&Что это?</translation> </message> <message> + <location filename="../Tools/TRPreviewer.py" line="205"/> + <source>Context sensitive help</source> + <translation>Контекстная помощь</translation> + </message> + <message> <location filename="../Tools/TRPreviewer.py" line="206"/> - <source>Context sensitive help</source> - <translation>Контекстная помощь</translation> - </message> - <message> - <location filename="../Tools/TRPreviewer.py" line="207"/> <source><b>Display context sensitive help</b><p>In What's This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.</p></source> <translation><b>Показать контекстную помощь</b> <p>В режиме контекстной помощи курсор мыши выглядит как стрелка со знаком вопроса, и, щёлкнув по элементу интерфейса, Вы можете просмотреть краткую помощь о его роли и его использовании. В диалогах можно воспользоваться кнопкой контекстной помощи в заголовке окна.</p></translation> </message> <message> + <location filename="../Tools/TRPreviewer.py" line="216"/> + <source>&About</source> + <translation>&О</translation> + </message> + <message> <location filename="../Tools/TRPreviewer.py" line="217"/> - <source>&About</source> - <translation>&О</translation> - </message> - <message> - <location filename="../Tools/TRPreviewer.py" line="218"/> <source>Display information about this software</source> <translation>Информация о ПО</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="220"/> + <location filename="../Tools/TRPreviewer.py" line="219"/> <source><b>About</b><p>Display some information about this software.</p></source> <translation><b>О...</b><p>Информация об этом программном продукте.</p></translation> </message> <message> + <location filename="../Tools/TRPreviewer.py" line="225"/> + <source>About &Qt</source> + <translation>О &Qt</translation> + </message> + <message> <location filename="../Tools/TRPreviewer.py" line="226"/> - <source>About &Qt</source> - <translation>О &Qt</translation> - </message> - <message> - <location filename="../Tools/TRPreviewer.py" line="227"/> <source>Display information about the Qt toolkit</source> <translation>Информация о библиотеке Qt</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="229"/> + <location filename="../Tools/TRPreviewer.py" line="228"/> <source><b>About Qt</b><p>Display some information about the Qt toolkit.</p></source> <translation><b>О Qt</b><p>Информация о библиотеке Qt.</p></translation> </message> <message> + <location filename="../Tools/TRPreviewer.py" line="234"/> + <source>&Tile</source> + <translation>&Заголовок</translation> + </message> + <message> <location filename="../Tools/TRPreviewer.py" line="235"/> - <source>&Tile</source> - <translation>&Заголовок</translation> + <source>Tile the windows</source> + <translation>Черепица</translation> </message> <message> <location filename="../Tools/TRPreviewer.py" line="236"/> - <source>Tile the windows</source> - <translation>Черепица</translation> - </message> - <message> - <location filename="../Tools/TRPreviewer.py" line="237"/> <source><b>Tile the windows</b><p>Rearrange and resize the windows so that they are tiled.</p></source> <translation><b>Черепица</b><p>Разложить окна черепицей.</p></translation> </message> <message> + <location filename="../Tools/TRPreviewer.py" line="243"/> + <source>&Cascade</source> + <translation>&Каскадом</translation> + </message> + <message> <location filename="../Tools/TRPreviewer.py" line="244"/> - <source>&Cascade</source> - <translation>&Каскадом</translation> + <source>Cascade the windows</source> + <translation>Разложить окна каскадом</translation> </message> <message> <location filename="../Tools/TRPreviewer.py" line="245"/> - <source>Cascade the windows</source> - <translation>Разложить окна каскадом</translation> - </message> - <message> - <location filename="../Tools/TRPreviewer.py" line="246"/> <source><b>Cascade the windows</b><p>Rearrange and resize the windows so that they are cascaded.</p></source> <translation><b>Каскадом</b><p>Разложить окна каскадом.</p></translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="253"/> + <location filename="../Tools/TRPreviewer.py" line="252"/> <source>&Close</source> <translation>&Закрыть</translation> </message> <message> + <location filename="../Tools/TRPreviewer.py" line="256"/> + <source>Close the current window</source> + <translation>Закрыть текущее окно</translation> + </message> + <message> <location filename="../Tools/TRPreviewer.py" line="257"/> - <source>Close the current window</source> - <translation>Закрыть текущее окно</translation> - </message> - <message> - <location filename="../Tools/TRPreviewer.py" line="258"/> <source><b>Close Window</b><p>Close the current window.</p></source> <translation><b>Закрыть окно</b> <p>Закрыть текущее окно.</p></translation> </message> <message> + <location filename="../Tools/TRPreviewer.py" line="263"/> + <source>Clos&e All</source> + <translation>Закрыть &всё</translation> + </message> + <message> <location filename="../Tools/TRPreviewer.py" line="264"/> - <source>Clos&e All</source> - <translation>Закрыть &всё</translation> + <source>Close all windows</source> + <translation>Закрыть все окна</translation> </message> <message> <location filename="../Tools/TRPreviewer.py" line="265"/> - <source>Close all windows</source> - <translation>Закрыть все окна</translation> - </message> - <message> - <location filename="../Tools/TRPreviewer.py" line="266"/> <source><b>Close All Windows</b><p>Close all windows.</p></source> <translation><b>Закрыть все окна</b> <p>Закрыть все окна.</p></translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="278"/> + <location filename="../Tools/TRPreviewer.py" line="277"/> <source>&File</source> <translation>&Файл</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="296"/> + <location filename="../Tools/TRPreviewer.py" line="295"/> <source>&Help</source> <translation>&Помощь</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="366"/> + <location filename="../Tools/TRPreviewer.py" line="365"/> <source>TR Previewer</source> <translation>TR Previewer</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="351"/> + <location filename="../Tools/TRPreviewer.py" line="350"/> <source><h3> About TR Previewer </h3><p>The TR Previewer loads and displays Qt User-Interface files and translation files and shows dialogs for a selected language.</p></source> <translation><h3> О TR Previewer </h3><p>TR Previewer загружает и отображает файлы описаний пользовательского интерфейса Qt и файлы переводов и показывает диалоги на выбранном языке.</p></translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="372"/> + <location filename="../Tools/TRPreviewer.py" line="371"/> <source>Qt User-Interface Files (*.ui)</source> <translation>Файлы описания интерфейса Qt (*.ui)</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="372"/> + <location filename="../Tools/TRPreviewer.py" line="371"/> <source>Select UI files</source> <translation>Выбрать файлы UI</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="387"/> + <location filename="../Tools/TRPreviewer.py" line="386"/> <source>Qt Translation Files (*.qm)</source> <translation>Файлы двоичных переводов (*.qm)</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="387"/> + <location filename="../Tools/TRPreviewer.py" line="386"/> <source>Select translation files</source> <translation>Выберите файлы переводов</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="179"/> + <location filename="../Tools/TRPreviewer.py" line="178"/> <source>&Reload Translations</source> <translation>&Перезагрузить переводы</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="193"/> + <location filename="../Tools/TRPreviewer.py" line="192"/> <source>Ctrl+Q</source> <comment>File|Quit</comment> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="205"/> + <location filename="../Tools/TRPreviewer.py" line="204"/> <source>Shift+F1</source> <translation>Shift+F1</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="255"/> + <location filename="../Tools/TRPreviewer.py" line="254"/> <source>Ctrl+W</source> <comment>File|Close</comment> <translation>Ctrl+W</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="307"/> + <location filename="../Tools/TRPreviewer.py" line="306"/> <source>File</source> <translation>Файл</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="317"/> + <location filename="../Tools/TRPreviewer.py" line="316"/> <source>Help</source> <translation>Помощь</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="289"/> + <location filename="../Tools/TRPreviewer.py" line="288"/> <source>&Window</source> <translation>&Окно</translation> </message> @@ -54125,82 +55667,82 @@ <context> <name>TabWidget</name> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="246"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="248"/> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="252"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="254"/> <source>Close All</source> <translation>Закрыть всё</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="255"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="257"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="258"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="260"/> <source>Save As...</source> <translation>Сохранить как...</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="261"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="263"/> <source>Save All</source> <translation>Сохранить всё</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="269"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="271"/> <source>Print</source> <translation>Печать</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="416"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="418"/> <source>{0} (ro)</source> <translation>{0} (только чтение)</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="233"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="235"/> <source>Move Left</source> <translation>Сдвинуть влево</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="236"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="238"/> <source>Move Right</source> <translation>Сдвинуть вправо</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="202"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="204"/> <source>Close the current editor</source> <translation>Закрыть текущий редактор</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="239"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="241"/> <source>Move First</source> <translation>Сделать первым</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="242"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="244"/> <source>Move Last</source> <translation>Сделать последним</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="192"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="194"/> <source>Show a navigation menu</source> <translation>Показать меню</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="249"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="251"/> <source>Close Others</source> <translation>Закрыть остальные</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="273"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="275"/> <source>Copy Path to Clipboard</source> <translation>Сопировать путь в буфер обмена</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="265"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="267"/> <source>Open 'rejection' file</source> <translation>Открыть 'отбракованный' файл</translation> </message> @@ -54323,12 +55865,12 @@ <context> <name>Tabview</name> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="898"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="900"/> <source>Untitled {0}</source> <translation>Без имени - {0}</translation> </message> <message> - <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1236"/> + <location filename="../Plugins/ViewManagerPlugins/Tabview/Tabview.py" line="1242"/> <source>{0} (ro)</source> <translation>{0} (только чтение)</translation> </message> @@ -55470,187 +57012,187 @@ <context> <name>ToolConfigurationDialog</name> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="129"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="134"/> <source>Add tool entry</source> <translation>Добавить инструментарий</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="100"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="105"/> <source>You have to set an executable to add to the Tools-Menu first.</source> <translation>Для добавления в Инструментарий необходимо сначала задать исполняемый файл.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="109"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="114"/> <source>You have to insert a menuentry text to add the selected program to the Tools-Menu first.</source> <translation>Для добавления программы в меню необходимо задать текст этого меню.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="118"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="123"/> <source>The selected file could not be found or is not an executable. Please choose an executable filename.</source> <translation>Выбранная программа не найдена, либо не является исполняемым файлом. Выберите исполняемый файл.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="180"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="185"/> <source>Change tool entry</source> <translation>Изменить элемент Инструментария</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="162"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="167"/> <source>You have to set an executable to change the Tools-Menu entry.</source> <translation>Для изменения элемента Инструментария необходимо задать исполняемый файл.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="171"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="176"/> <source>You have to insert a menuentry text to change the selected Tools-Menu entry.</source> <translation>Для изменения программы в меню необходимо задать текст этого меню.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="180"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="185"/> <source>The selected file could not be found or is not an executable. Please choose an existing executable filename.</source> <translation>Выбранная программа не найдена, либо не является исполняемым файлом. Выберите исполняемый файл.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="275"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="280"/> <source>Select executable</source> <translation>Выбор исполняемого файла</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="275"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="280"/> <source>The selected file is not an executable. Please choose an executable filename.</source> <translation>Выбранная программа не найдена, либо не является исполняемым файлом. Выберите исполняемый файл.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="13"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="14"/> <source>Configure Tools Menu</source> <translation>Настроить меню Инструментария</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="24"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="25"/> <source>Add a separator</source> <translation>Добавить разделитель</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="27"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="28"/> <source><b>Add separator</b><p>Add a separator for the menu.</p></source> <translation><b>Добавить разделитель</b><p>Добавить разделитель для меню.</p></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="30"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="31"/> <source>Add &Separator</source> <translation>Добавить &разделитель</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="37"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="38"/> <source>Add a new tools entry</source> <translation>Добавить элемент Инструментария</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="40"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="41"/> <source><b>Add</b> <p>Add a new tools entry with the values entered below.</p></source> <translation><b>Добавить</b> <p>Добавить элемент Инструментария со значениями, заданными ниже.</p></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="44"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="45"/> <source>&Add</source> <translation>&Добавить</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="47"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="48"/> <source>Alt+A</source> <translation>Alt+A</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="57"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="58"/> <source>Select the output redirection mode</source> <translation>Выберите режим перенаправления вывода</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="67"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="68"/> <source>Enter the arguments for the executable</source> <translation>Задайте агрументы исполняемого файла</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="70"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="71"/> <source><b>Arguments</b> <p>Enter the arguments for the executable.</p></source> <translation><b>Аргументы</b> <p>Задайте агрументы исполняемого файла.</p></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="81"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="82"/> <source>Move up</source> <translation>Сдвинуть вверх</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="84"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="85"/> <source><b>Move Up</b> <p>Move the selected entry up.</p></source> <translation><b>Сдвинуть вверх</b> <p>Сдвинуть вверх выбранный элемент.</p></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="88"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="89"/> <source>&Up</source> <translation>&Выше</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="91"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="92"/> <source>Alt+U</source> <translation>Alt+U</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="101"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="102"/> <source>Delete the selected entry</source> <translation>Удалить выбранный элемент</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="104"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="105"/> <source><b>Delete</b> <p>Delete the selected entry.</p></source> <translation><b>Удалить</b> <p>Удалить выбранный элемент.</p></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="108"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="109"/> <source>&Delete</source> <translation>&Удалить</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="111"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="112"/> <source>Alt+D</source> <translation>Alt+D</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="118"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="119"/> <source>Clear all entry fields</source> <translation>Очистить все поля</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="121"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="122"/> <source><b>New</b> <p>Clear all entry fields for entering a new tools entry.</p></source> <translation><b>Новый</b> <p>Очистить все поля для описания нового инструмента.</p></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="125"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="126"/> <source>&New</source> <translation>&Новый</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="128"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="129"/> <source>Alt+N</source> <translation>Alt+N</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="135"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="282"/> <source>Select the icon via a file selection dialog</source> <translation>Выберите пиктограмму с помощью файлового диалога</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="138"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="285"/> <source><b>Icon</b> <p>Select the icon via a file selection dialog.</p></source> <translation><b>Пиктограмма</b> @@ -55659,162 +57201,162 @@ <message> <location filename="../Preferences/ToolConfigurationDialog.ui" line="271"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="149"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="136"/> <source>Enter the filename of the executable</source> <translation>Задайте имя исполняемого файла</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="152"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="139"/> <source><b>Executable</b> <p>Enter the filename of the executable.</p></source> <translation><b>Исполняемый файл</b> <p>Задайте имя исполняемого файла.</p></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="163"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="150"/> <source>Move down</source> <translation>Сдвинуть вниз</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="166"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="153"/> <source><b>Move Down</b> <p>Move the selected entry down.</p></source> <translation><b>Сдвинуть вниз</b> <p>Сдвинуть вниз выбранный элемент.</p></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="170"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="157"/> <source>Do&wn</source> <translation>&Ниже</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="173"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="160"/> <source>Alt+W</source> <translation>Alt+W</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="196"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="183"/> <source>Enter the menu text</source> <translation>Задайте текст меню</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="199"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="186"/> <source><b>Menu text</b> <p>Enter the menu text. Precede the accelerator key with an & character.</p></source> <translation><b>Menu text</b> <p>Задайте текст меню. Для указания быстрой клавиши поставьте перед символом &.</p></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="210"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="197"/> <source>Change the values of the selected entry</source> <translation>Изменить значения выбранного элемента</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="213"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="200"/> <source><b>Change</b> <p>Change the values of the selected entry.</p></source> <translation><b>Изменить</b> <p>Изменить значения выбранного элемента.</p></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="217"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="204"/> <source>C&hange</source> <translation>&Изменить</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="220"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="207"/> <source>Alt+H</source> <translation>Alt+H</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="227"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="214"/> <source>&Icon file:</source> <translation>Файл &пиктограммы:</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="237"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="224"/> <source>Ar&guments:</source> <translation>&Аргументы:</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="247"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="234"/> <source>&Menu text:</source> <translation>Текст &меню:</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="264"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="293"/> <source>Select the executable via a file selection dialog</source> <translation>Выберите программу с помощью диалога</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="267"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="296"/> <source><b>Executable</b> <p>Select the executable via a file selection dialog.</p></source> <translation><b>Исполняемый файл</b> <p>Выберите программу с помощью диалога.</p></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="278"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="251"/> <source>Enter the filename of the icon</source> <translation>Введите имя файла пиктограммы</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="281"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="254"/> <source><b>Icon</b> <p>Enter the filename of the icon.</p></source> <translation><b>Пиктограмма</b> <p>Задайте имя файла, содержащего пиктограмму.</p></translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="289"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="262"/> <source>&Redirect output</source> <translation>&Перенаправить вывод</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="299"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="272"/> <source>&Executable file:</source> <translation>П&рограмма:</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="40"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="45"/> <source>no redirection</source> <translation>Нет перенаправления</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="41"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="46"/> <source>show output</source> <translation>показывать вывод</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="42"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="47"/> <source>insert into current editor</source> <translation>вставлять в текущий редактор</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="43"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="48"/> <source>replace selection of current editor</source> <translation>заменить выделение в текущем редакторе</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="129"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="134"/> <source>An entry for the menu text {0} already exists.</source> <translation>Элемент меню с текстом '{0}' уже существует.</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="290"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="295"/> <source>Select icon file</source> <translation>Задайте имя файла пиктограммы</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.py" line="290"/> + <location filename="../Preferences/ToolConfigurationDialog.py" line="295"/> <source>Icon files (*.png)</source> <translation>Файлы пиктограмм (*.png)</translation> </message> <message> - <location filename="../Preferences/ToolConfigurationDialog.ui" line="60"/> + <location filename="../Preferences/ToolConfigurationDialog.ui" line="61"/> <source><b>Redirect output<b><p>Select the output redirection mode. The standard error channel is either not redirected or shown in the log viewer.</p></source> <translation><b>Перенаправить вывод<b> <p>Выберите режим перенаправления вывода. Поток стандартного вывода ошибок либо не перенаправляется, либо отображается в просмотрщике журнала.</p></translation> @@ -56005,12 +57547,12 @@ <context> <name>TranslationPropertiesDialog</name> <message> - <location filename="../Project/TranslationPropertiesDialog.ui" line="50"/> + <location filename="../Project/TranslationPropertiesDialog.ui" line="82"/> <source>Show directory selection dialog</source> <translation>Показать диалог выбора каталога</translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.ui" line="28"/> + <location filename="../Project/TranslationPropertiesDialog.ui" line="85"/> <source><b>Binary Translations Path</b> <p>Select the directory for the binary translations via a directory selection dialog.</p></source> <translation><b>Каталог двоичных переводов</b> @@ -56019,82 +57561,82 @@ <message> <location filename="../Project/TranslationPropertiesDialog.ui" line="57"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../Project/TranslationPropertiesDialog.ui" line="64"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../Project/TranslationPropertiesDialog.ui" line="36"/> <source>&Binary Translations Path:</source> <translation>Каталог &двоичных переводов:</translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.ui" line="39"/> + <location filename="../Project/TranslationPropertiesDialog.ui" line="25"/> <source>Enter the path for the binary translation files (*.qm)</source> <translation>Задайте путь для каталога двоичных переводов (*.qm)</translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.ui" line="42"/> + <location filename="../Project/TranslationPropertiesDialog.ui" line="28"/> <source><b>Binary Translations Path</b> <p>Enter the directory for the binary translation files (*.qm). Leave it empty to store them together with the *.ts files.</p></source> <translation><b>Каталог двоичных переводов</b> <p>Задайте путь для каталога двоичных переводов (*.qm). Оставьте поле пустым для хранения двоичных переводов в одном каталоге с файлами *.ts.</p></translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.ui" line="101"/> + <location filename="../Project/TranslationPropertiesDialog.ui" line="95"/> <source>Exclude from translation</source> <translation>Исключить из переводов</translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.ui" line="107"/> + <location filename="../Project/TranslationPropertiesDialog.ui" line="101"/> <source>Press to select a directory via a selection dialog</source> <translation>Задайте каталог с помощью диалога выброа каталога</translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.ui" line="110"/> + <location filename="../Project/TranslationPropertiesDialog.ui" line="104"/> <source>Select d&irectory...</source> <translation>Выбрать &каталог...</translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.ui" line="117"/> + <location filename="../Project/TranslationPropertiesDialog.ui" line="111"/> <source>Press to select a file via a selection dialog</source> <translation>Задайте файл с помощью диалога выбора</translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.ui" line="120"/> + <location filename="../Project/TranslationPropertiesDialog.ui" line="114"/> <source>Select &file...</source> <translation>Задать &файл...</translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.ui" line="130"/> + <location filename="../Project/TranslationPropertiesDialog.ui" line="124"/> <source>Press to add the entered path or file to the list</source> <translation>Добавить введённый путь в список</translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.ui" line="133"/> + <location filename="../Project/TranslationPropertiesDialog.ui" line="127"/> <source>&Add</source> <translation>&Добавить</translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.ui" line="146"/> + <location filename="../Project/TranslationPropertiesDialog.ui" line="140"/> <source>&Delete</source> <translation>&Удалить</translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.ui" line="153"/> + <location filename="../Project/TranslationPropertiesDialog.ui" line="147"/> <source>Enter a path or file to be added</source> <translation>Задайте путь или файл для добавления в список</translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.ui" line="160"/> + <location filename="../Project/TranslationPropertiesDialog.ui" line="154"/> <source>List of paths or files to excude from translation</source> <translation>Список файлов для исключения из переводов</translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.py" line="169"/> + <location filename="../Project/TranslationPropertiesDialog.py" line="173"/> <source>Exempt file from translation</source> <translation>Исключить файл из переводов</translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.py" line="182"/> + <location filename="../Project/TranslationPropertiesDialog.py" line="186"/> <source>Exempt directory from translation</source> <translation>Исключить каталог из переводов</translation> </message> @@ -56104,56 +57646,56 @@ <translation>Свойства переводов</translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.ui" line="143"/> + <location filename="../Project/TranslationPropertiesDialog.ui" line="137"/> <source>Press to delete the selected entry from the list</source> <translation>Нажмите кнопку для удаления элемента из списка</translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.py" line="60"/> - <source>Source Files ({0});;</source> - <translation>Файлы с исходниками ({0});;</translation> - </message> - <message> - <location filename="../Project/TranslationPropertiesDialog.py" line="62"/> - <source>Forms Files ({0});;</source> - <translation>Файлы с формами ({0});;</translation> - </message> - <message> <location filename="../Project/TranslationPropertiesDialog.py" line="64"/> + <source>Source Files ({0});;</source> + <translation>Файлы с исходниками ({0});;</translation> + </message> + <message> + <location filename="../Project/TranslationPropertiesDialog.py" line="66"/> + <source>Forms Files ({0});;</source> + <translation>Файлы с формами ({0});;</translation> + </message> + <message> + <location filename="../Project/TranslationPropertiesDialog.py" line="68"/> <source>All Files (*)</source> <translation>Все файлы(*)</translation> </message> <message> + <location filename="../Project/TranslationPropertiesDialog.ui" line="46"/> + <source>Enter the path pattern for the translation files</source> + <translation>Задайте шаблон для каталога файлов переводов</translation> + </message> + <message> + <location filename="../Project/TranslationPropertiesDialog.py" line="101"/> + <source>Select translation file</source> + <translation>Выберите файл перевода</translation> + </message> + <message> + <location filename="../Project/TranslationPropertiesDialog.py" line="130"/> + <source>Select directory for binary translations</source> + <translation>Задайте путь для каталога двоичных переводов</translation> + </message> + <message> <location filename="../Project/TranslationPropertiesDialog.ui" line="74"/> - <source>Enter the path pattern for the translation files</source> - <translation>Задайте шаблон для каталога файлов переводов</translation> - </message> - <message> - <location filename="../Project/TranslationPropertiesDialog.py" line="97"/> - <source>Select translation file</source> - <translation>Выберите файл перевода</translation> - </message> - <message> - <location filename="../Project/TranslationPropertiesDialog.py" line="126"/> - <source>Select directory for binary translations</source> - <translation>Задайте путь для каталога двоичных переводов</translation> - </message> - <message> - <location filename="../Project/TranslationPropertiesDialog.ui" line="53"/> <source><b>Translation Pattern</b> <p>Select a translation file via a file selection dialog.</p></source> <translation><b>Шаблон для каталога файлов переводов</b> <p>Выберите файл переводов с помощью диалога выбора файлов.</p></translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.ui" line="77"/> + <location filename="../Project/TranslationPropertiesDialog.ui" line="49"/> <source><b>Translation Pattern</b> <p>Enter the path pattern for the translation files using %language% at the place of the language code (e.g. /path_to_eric/i18n/eric5_%language%.ts). This will result in translation files like /path_to_eric/i18n/eric5_de.ts.</p></source> <translation><b>Шаблон для каталога файлов переводов</b> <p>Используйте '%language%' там где должен быть код языка, например - /path_to_eric/i18n/eric4_%language%.ts. В результате получится например файл /path_to_eric/i18n/eric_de.ts.</p></translation> </message> <message> - <location filename="../Project/TranslationPropertiesDialog.ui" line="85"/> + <location filename="../Project/TranslationPropertiesDialog.ui" line="57"/> <source>&Translation Path Pattern: (Use '%language%' where the language code should be inserted, e.g. i18n/eric5_%language%.ts)</source> <translation>&Шаблон для каталога файлов переводов: @@ -56163,27 +57705,27 @@ <context> <name>TranslationsDict</name> <message> - <location filename="../Tools/TRPreviewer.py" line="508"/> + <location filename="../Tools/TRPreviewer.py" line="507"/> <source>Set Translator</source> <translation>Установка переводчика</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="478"/> + <location filename="../Tools/TRPreviewer.py" line="477"/> <source><p>The translation filename <b>{0}</b> is invalid.</p></source> <translation><p>Файл переода <b>{0}</b> некорректен.</p></translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="508"/> + <location filename="../Tools/TRPreviewer.py" line="507"/> <source><p>The translator <b>{0}</b> is not known.</p></source> <translation><p>Неизвестный переводчик <b>{0}</b>.</p></translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="651"/> + <location filename="../Tools/TRPreviewer.py" line="650"/> <source>Load Translator</source> <translation>Загрузить переводчик</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="651"/> + <location filename="../Tools/TRPreviewer.py" line="650"/> <source><p>The translation file <b>{0}</b> could not be loaded.</p></source> <translation><p>Невозможно прочитать файл перевода: <b>{0}</b></p></translation> </message> @@ -56191,12 +57733,12 @@ <context> <name>Transplant</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py" line="72"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py" line="71"/> <source>Transplant Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py" line="99"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/transplant.py" line="97"/> <source>Transplant Changesets (Continue)</source> <translation type="unfinished"></translation> </message> @@ -56214,62 +57756,62 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="46"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="49"/> <source>Repositor&y:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="56"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="59"/> <source>Enter a repository URL, if changesets shall be transplanted from a repository</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="63"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="66"/> <source>&Branch:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="73"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="76"/> <source>Select or enter the branch to transplant from</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="86"/> - <source>Select to transplant all changesets of the branch</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="89"/> + <source>Select to transplant all changesets of the branch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="92"/> <source>Transplant &All Changesets</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="96"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="99"/> <source>&Skip:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="119"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="125"/> <source>&Merge:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="129"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="135"/> <source>Enter revisions to be merged separated by a space character</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="136"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="142"/> <source>Select to append transplant info to the log message</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="139"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="145"/> <source>Append Transplant &Info</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="106"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/TransplantExtension/TransplantDialog.ui" line="112"/> <source>Enter changesets by number, id, range or revset expression one per line</source> <translation type="unfinished"></translation> </message> @@ -56531,278 +58073,278 @@ <context> <name>UIPreviewer</name> <message> - <location filename="../Tools/UIPreviewer.py" line="316"/> + <location filename="../Tools/UIPreviewer.py" line="315"/> <source>UI Previewer</source> <translation>UI Previewer</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="70"/> + <location filename="../Tools/UIPreviewer.py" line="69"/> <source>Select GUI Theme</source> <translation>Задайте тему интерфейса</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="77"/> + <location filename="../Tools/UIPreviewer.py" line="76"/> <source>Select the GUI Theme</source> <translation>Задайте тему интерфейса</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="127"/> + <location filename="../Tools/UIPreviewer.py" line="126"/> <source>&Open File</source> <translation>&Открыть файл</translation> </message> <message> + <location filename="../Tools/UIPreviewer.py" line="131"/> + <source>Open a UI file for display</source> + <translation>Открыть для просмотра файл UI (описание пользовательского интерфейса)</translation> + </message> + <message> <location filename="../Tools/UIPreviewer.py" line="132"/> - <source>Open a UI file for display</source> - <translation>Открыть для просмотра файл UI (описание пользовательского интерфейса)</translation> - </message> - <message> - <location filename="../Tools/UIPreviewer.py" line="133"/> <source><b>Open File</b><p>This opens a new UI file for display.</p></source> <translation><b>Открыть файл UI</b><p>Открыть для просмотра файл UI (описание пользовательского интерфейса).</p></translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="139"/> + <location filename="../Tools/UIPreviewer.py" line="138"/> <source>&Print</source> <translation>&Печать</translation> </message> <message> + <location filename="../Tools/UIPreviewer.py" line="143"/> + <source>Print a screen capture</source> + <translation>Печать снимка экрана</translation> + </message> + <message> <location filename="../Tools/UIPreviewer.py" line="144"/> - <source>Print a screen capture</source> - <translation>Печать снимка экрана</translation> - </message> - <message> - <location filename="../Tools/UIPreviewer.py" line="145"/> <source><b>Print</b><p>Print a screen capture.</p></source> <translation><b>Печать</b><p>Печать снимка экрана.</p></translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="162"/> + <location filename="../Tools/UIPreviewer.py" line="161"/> <source>&Screen Capture</source> <translation>Снимок &экрана</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="167"/> + <location filename="../Tools/UIPreviewer.py" line="166"/> <source>Save a screen capture to an image file</source> <translation>Сохранить снимок экрана в файл с изображением</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="169"/> + <location filename="../Tools/UIPreviewer.py" line="168"/> <source><b>Screen Capture</b><p>Save a screen capture to an image file.</p></source> <translation><b>Снимок экрана</b><p>Сохранить снимок экрана в файл с изображением.</p></translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="175"/> + <location filename="../Tools/UIPreviewer.py" line="174"/> <source>&Quit</source> <translation>&Выход</translation> </message> <message> + <location filename="../Tools/UIPreviewer.py" line="178"/> + <source>Quit the application</source> + <translation>Выйти из приложения</translation> + </message> + <message> <location filename="../Tools/UIPreviewer.py" line="179"/> - <source>Quit the application</source> - <translation>Выйти из приложения</translation> - </message> - <message> - <location filename="../Tools/UIPreviewer.py" line="180"/> <source><b>Quit</b><p>Quit the application.</p></source> <translation><b>Выход</b><p>Выйти из приложения.</p></translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="186"/> + <location filename="../Tools/UIPreviewer.py" line="185"/> <source>&Copy</source> <translation>&Копировать</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="190"/> + <location filename="../Tools/UIPreviewer.py" line="189"/> <source>Copy screen capture to clipboard</source> <translation>Сопировать снимок экрана в буфер обмена</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="192"/> + <location filename="../Tools/UIPreviewer.py" line="191"/> <source><b>Copy</b><p>Copy screen capture to clipboard.</p></source> <translation><b>Копировать</b><p>Копировать снимок экрана в буфер обмена.</p></translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="198"/> + <location filename="../Tools/UIPreviewer.py" line="197"/> <source>&What's This?</source> <translation>&Что это?</translation> </message> <message> + <location filename="../Tools/UIPreviewer.py" line="201"/> + <source>Context sensitive help</source> + <translation>Контекстная помощь</translation> + </message> + <message> <location filename="../Tools/UIPreviewer.py" line="202"/> - <source>Context sensitive help</source> - <translation>Контекстная помощь</translation> - </message> - <message> - <location filename="../Tools/UIPreviewer.py" line="203"/> <source><b>Display context sensitive help</b><p>In What's This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.</p></source> <translation><b>Показать контекстную помощь</b> <p>В режиме контекстной помощи курсор мыши выглядит как стрелка со знаком вопроса, и, щёлкнув по элементу интерфейса, Вы можете просмотреть краткую помощь о его роли и его использовании. В диалогах можно воспользоваться кнопкой контекстной помощи в заголовке окна.</p></translation> </message> <message> + <location filename="../Tools/UIPreviewer.py" line="212"/> + <source>&About</source> + <translation>&О</translation> + </message> + <message> <location filename="../Tools/UIPreviewer.py" line="213"/> - <source>&About</source> - <translation>&О</translation> - </message> - <message> - <location filename="../Tools/UIPreviewer.py" line="214"/> <source>Display information about this software</source> <translation>Информация о ПО</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="216"/> + <location filename="../Tools/UIPreviewer.py" line="215"/> <source><b>About</b><p>Display some information about this software.</p></source> <translation><b>О...</b><p>Информация об этом программном продукте.</p></translation> </message> <message> + <location filename="../Tools/UIPreviewer.py" line="221"/> + <source>About &Qt</source> + <translation>О &Qt</translation> + </message> + <message> <location filename="../Tools/UIPreviewer.py" line="222"/> - <source>About &Qt</source> - <translation>О &Qt</translation> - </message> - <message> - <location filename="../Tools/UIPreviewer.py" line="223"/> <source>Display information about the Qt toolkit</source> <translation>Информация о библиотеке Qt</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="225"/> + <location filename="../Tools/UIPreviewer.py" line="224"/> <source><b>About Qt</b><p>Display some information about the Qt toolkit.</p></source> <translation><b>О Qt</b><p>Информация о библиотеке Qt.</p></translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="237"/> + <location filename="../Tools/UIPreviewer.py" line="236"/> <source>&File</source> <translation>&Файл</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="247"/> + <location filename="../Tools/UIPreviewer.py" line="246"/> <source>&Edit</source> <translation>&Правка</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="253"/> + <location filename="../Tools/UIPreviewer.py" line="252"/> <source>&Help</source> <translation>&Помощь</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="301"/> + <location filename="../Tools/UIPreviewer.py" line="300"/> <source><h3> About UI Previewer </h3><p>The UI Previewer loads and displays Qt User-Interface files with various styles, which are selectable via a selection list.</p></source> <translation><h3> О UI Previewer </h3><p>UI Previewer загружает и отображает файлы описаний пользовательского интерфейса Qt в нескольких стилях, которые доступны через список выбора.</p></translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="322"/> + <location filename="../Tools/UIPreviewer.py" line="321"/> <source>Qt User-Interface Files (*.ui)</source> <translation>Файлы описания интерфейса Qt (*.ui)</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="322"/> + <location filename="../Tools/UIPreviewer.py" line="321"/> <source>Select UI file</source> <translation>Выберите файл UI</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="359"/> + <location filename="../Tools/UIPreviewer.py" line="358"/> <source>Load UI File</source> <translation>Загрузить файл UI</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="359"/> + <location filename="../Tools/UIPreviewer.py" line="358"/> <source><p>The file <b>{0}</b> could not be loaded.</p></source> <translation><p>Невозможно загрузить файл: <b>{0}</b></p></translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="494"/> + <location filename="../Tools/UIPreviewer.py" line="493"/> <source>Save Image</source> <translation>Сохранить изображение</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="555"/> + <location filename="../Tools/UIPreviewer.py" line="554"/> <source>There is no UI file loaded.</source> <translation>Не загружено ни одного файла.</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="461"/> + <location filename="../Tools/UIPreviewer.py" line="460"/> <source>Images ({0})</source> <translation>Изображения ({0})</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="482"/> + <location filename="../Tools/UIPreviewer.py" line="481"/> <source><p>The file <b>{0}</b> could not be saved.</p></source> <translation><p>Невозможно сохранить файл: <b>{0}</b></p></translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="536"/> + <location filename="../Tools/UIPreviewer.py" line="535"/> <source>Printing the image...</source> <translation>Идёт печать изображения...</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="545"/> + <location filename="../Tools/UIPreviewer.py" line="544"/> <source>Image sent to printer...</source> <translation>Изображение отправлено на принтер...</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="130"/> + <location filename="../Tools/UIPreviewer.py" line="129"/> <source>Ctrl+O</source> <comment>File|Open</comment> <translation>Ctrl+O</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="142"/> + <location filename="../Tools/UIPreviewer.py" line="141"/> <source>Ctrl+P</source> <comment>File|Print</comment> <translation>Ctrl+P</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="165"/> + <location filename="../Tools/UIPreviewer.py" line="164"/> <source>Ctrl+S</source> <comment>File|Screen Capture</comment> <translation>Ctrl+S</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="177"/> + <location filename="../Tools/UIPreviewer.py" line="176"/> <source>Ctrl+Q</source> <comment>File|Quit</comment> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="188"/> + <location filename="../Tools/UIPreviewer.py" line="187"/> <source>Ctrl+C</source> <comment>Edit|Copy</comment> <translation>Ctrl+C</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="201"/> + <location filename="../Tools/UIPreviewer.py" line="200"/> <source>Shift+F1</source> <translation>Shift+F1</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="264"/> + <location filename="../Tools/UIPreviewer.py" line="263"/> <source>File</source> <translation>Файл</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="274"/> + <location filename="../Tools/UIPreviewer.py" line="273"/> <source>Edit</source> <translation>Редактировать</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="278"/> + <location filename="../Tools/UIPreviewer.py" line="277"/> <source>Help</source> <translation>Помощь</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="555"/> + <location filename="../Tools/UIPreviewer.py" line="554"/> <source>Print Preview</source> <translation>Предварительный просмотр печати</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="154"/> + <location filename="../Tools/UIPreviewer.py" line="153"/> <source>Print preview a screen capture</source> <translation>Предварительный просмотр печати снимка экрана</translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="156"/> + <location filename="../Tools/UIPreviewer.py" line="155"/> <source><b>Print Preview</b><p>Print preview a screen capture.</p></source> <translation><b>Предварительный просмотр печати</b><p>Предварительный просмотр печати снимка экрана.</p></translation> </message> <message> - <location filename="../Tools/UIPreviewer.py" line="512"/> + <location filename="../Tools/UIPreviewer.py" line="511"/> <source>Print Image</source> <translation>Печать изображения</translation> </message> @@ -56896,42 +58438,42 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../Graphics/UMLDialog.py" line="261"/> + <location filename="../Graphics/UMLDialog.py" line="262"/> <source>Save Diagram</source> <translation>Сохранить диаграмму</translation> </message> <message> - <location filename="../Graphics/UMLDialog.py" line="277"/> + <location filename="../Graphics/UMLDialog.py" line="278"/> <source>Eric5 Graphics File (*.e5g);;All Files (*)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Graphics/UMLDialog.py" line="234"/> + <location filename="../Graphics/UMLDialog.py" line="235"/> <source><p>The file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже сущеструет. Переписать?</p></translation> </message> <message> - <location filename="../Graphics/UMLDialog.py" line="261"/> + <location filename="../Graphics/UMLDialog.py" line="262"/> <source><p>The file <b>{0}</b> could not be saved.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Graphics/UMLDialog.py" line="381"/> + <location filename="../Graphics/UMLDialog.py" line="382"/> <source>Load Diagram</source> <translation type="unfinished">Загрузить диаграмму</translation> </message> <message> - <location filename="../Graphics/UMLDialog.py" line="291"/> + <location filename="../Graphics/UMLDialog.py" line="292"/> <source><p>The file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Graphics/UMLDialog.py" line="375"/> + <location filename="../Graphics/UMLDialog.py" line="376"/> <source><p>The file <b>{0}</b> does not contain valid data.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../Graphics/UMLDialog.py" line="378"/> + <location filename="../Graphics/UMLDialog.py" line="379"/> <source><p>The file <b>{0}</b> does not contain valid data.</p><p>Invalid line: {1}</p></source> <translation type="unfinished"></translation> </message> @@ -57105,47 +58647,47 @@ <context> <name>UnittestDialog</name> <message> - <location filename="../PyUnit/UnittestDialog.py" line="394"/> + <location filename="../PyUnit/UnittestDialog.py" line="396"/> <source>Unittest</source> <translation>Unittest</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="259"/> + <location filename="../PyUnit/UnittestDialog.py" line="261"/> <source>You must enter a test suite file.</source> <translation>Необходимо ввести имя файла с пакетом тестов.</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="267"/> + <location filename="../PyUnit/UnittestDialog.py" line="269"/> <source>Preparing Testsuite</source> <translation>Подготовка пакета тестов</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="506"/> + <location filename="../PyUnit/UnittestDialog.py" line="508"/> <source>Failure: {0}</source> <translation>Неудача: {0}</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="521"/> + <location filename="../PyUnit/UnittestDialog.py" line="523"/> <source>Error: {0}</source> <translation>Ошибка: {0}</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="115"/> + <location filename="../PyUnit/UnittestDialog.py" line="117"/> <source>^Failure: </source> <translation>^Неудача: </translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="116"/> + <location filename="../PyUnit/UnittestDialog.py" line="118"/> <source>^Error: </source> <translation>^Ошибка:</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="463"/> + <location filename="../PyUnit/UnittestDialog.py" line="465"/> <source>Running</source> <translation>Выполяется</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="394"/> + <location filename="../PyUnit/UnittestDialog.py" line="396"/> <source><p>Unable to run test <b>{0}</b>.<br>{1}<br>{2}</p></source> <translation><p>Невозможно запустить тест<b>{0}</b>.<br>{1}<br>{2}</p></translation> </message> @@ -57184,62 +58726,62 @@ <translation>Задайте &имя теста:</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="81"/> + <location filename="../PyUnit/UnittestDialog.ui" line="91"/> <source>Open a file selection dialog</source> <translation>Показать диалог выбора файлов</translation> </message> <message> <location filename="../PyUnit/UnittestDialog.ui" line="84"/> <source>...</source> - <translation>...</translation> - </message> - <message> - <location filename="../PyUnit/UnittestDialog.ui" line="91"/> + <translation type="obsolete">...</translation> + </message> + <message> + <location filename="../PyUnit/UnittestDialog.ui" line="81"/> <source>Enter test &filename:</source> <translation>Задайте &имя файла с тестами:</translation> </message> <message> + <location filename="../PyUnit/UnittestDialog.ui" line="107"/> + <source>Select whether you want to run the test locally</source> + <translation>Хотите ли Вы запустить тест локально</translation> + </message> + <message> <location filename="../PyUnit/UnittestDialog.ui" line="110"/> - <source>Select whether you want to run the test locally</source> - <translation>Хотите ли Вы запустить тест локально</translation> - </message> - <message> - <location filename="../PyUnit/UnittestDialog.ui" line="113"/> <source>Run &local</source> <translation>Выполнить &локально</translation> </message> <message> + <location filename="../PyUnit/UnittestDialog.ui" line="117"/> + <source>Select whether coverage data should be collected</source> + <translation>Должны ли собираться данные охвата</translation> + </message> + <message> <location filename="../PyUnit/UnittestDialog.ui" line="120"/> - <source>Select whether coverage data should be collected</source> - <translation>Должны ли собираться данные охвата</translation> - </message> - <message> - <location filename="../PyUnit/UnittestDialog.ui" line="123"/> <source>C&ollect coverage data</source> <translation>Собирать данные &охвата</translation> </message> <message> + <location filename="../PyUnit/UnittestDialog.ui" line="130"/> + <source>Select whether old coverage data should be erased</source> + <translation>Должны ли собираться данные охвата</translation> + </message> + <message> <location filename="../PyUnit/UnittestDialog.ui" line="133"/> - <source>Select whether old coverage data should be erased</source> - <translation>Должны ли собираться данные охвата</translation> - </message> - <message> - <location filename="../PyUnit/UnittestDialog.ui" line="136"/> <source>&Erase coverage data</source> <translation>&Удалить данные охвата</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="154"/> + <location filename="../PyUnit/UnittestDialog.ui" line="151"/> <source>Progress:</source> <translation>Прогресс:</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="194"/> + <location filename="../PyUnit/UnittestDialog.ui" line="191"/> <source>Run:</source> <translation>Запустить:</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="201"/> + <location filename="../PyUnit/UnittestDialog.ui" line="198"/> <source>Number of tests run</source> <translation>Количество запущенных тестов</translation> </message> @@ -57249,52 +58791,52 @@ <translation type="obsolete">0</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="245"/> + <location filename="../PyUnit/UnittestDialog.ui" line="242"/> <source>Failures:</source> <translation>Неудачи:</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="252"/> + <location filename="../PyUnit/UnittestDialog.ui" line="249"/> <source>Number of test failures</source> <translation>Количество неудач в тестах</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="262"/> + <location filename="../PyUnit/UnittestDialog.ui" line="259"/> <source>Errors:</source> <translation>Ошибки:</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="269"/> + <location filename="../PyUnit/UnittestDialog.ui" line="266"/> <source>Number of test errors</source> <translation>Количество ошибок в тестах</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="211"/> + <location filename="../PyUnit/UnittestDialog.ui" line="208"/> <source>Remaining:</source> <translation>Осталось:</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="218"/> + <location filename="../PyUnit/UnittestDialog.ui" line="215"/> <source>Number of tests to be run</source> <translation>Количество ещё не пройденных тестов</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="351"/> + <location filename="../PyUnit/UnittestDialog.ui" line="348"/> <source>Tests performed:</source> <translation>Проведённые тесты:</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="361"/> + <location filename="../PyUnit/UnittestDialog.ui" line="358"/> <source>Failures and errors:</source> <translation>Неудачи и ошибки:</translation> </message> <message> + <location filename="../PyUnit/UnittestDialog.ui" line="365"/> + <source>Failures and Errors list</source> + <translation>Список неудач и ошибок</translation> + </message> + <message> <location filename="../PyUnit/UnittestDialog.ui" line="368"/> - <source>Failures and Errors list</source> - <translation>Список неудач и ошибок</translation> - </message> - <message> - <location filename="../PyUnit/UnittestDialog.ui" line="371"/> <source><b>Failures and Errors list</b> <p>This list shows all failed and errored tests. Double clicking on an entry will show the respective traceback.</p></source> @@ -57304,127 +58846,127 @@ отобразит сообтетствующий стек вызовов.</p></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="65"/> + <location filename="../PyUnit/UnittestDialog.py" line="67"/> <source>Start the selected testsuite</source> <translation>Запустить выбранный пакет тестов</translation> </message> <message> + <location filename="../PyUnit/UnittestDialog.py" line="82"/> + <source>Stop the running unittest</source> + <translation>Остановить выполняющийся пакет тестов</translation> + </message> + <message> + <location filename="../PyUnit/UnittestDialog.ui" line="395"/> + <source>Idle</source> + <translation>Задайте имя, определяющее пакет тестов</translation> + </message> + <message> + <location filename="../PyUnit/UnittestDialog.py" line="65"/> + <source>Start</source> + <translation>Начало</translation> + </message> + <message> + <location filename="../PyUnit/UnittestDialog.py" line="69"/> + <source><b>Start Test</b><p>This button starts the selected testsuite.</p></source> + <translation><b>Запустить тесты</b><p>Запустить выбранный пакет тестов.</p></translation> + </message> + <message> <location filename="../PyUnit/UnittestDialog.py" line="80"/> - <source>Stop the running unittest</source> - <translation>Остановить выполняющийся пакет тестов</translation> - </message> - <message> - <location filename="../PyUnit/UnittestDialog.ui" line="398"/> - <source>Idle</source> - <translation>Задайте имя, определяющее пакет тестов</translation> - </message> - <message> - <location filename="../PyUnit/UnittestDialog.py" line="63"/> - <source>Start</source> - <translation>Начало</translation> - </message> - <message> - <location filename="../PyUnit/UnittestDialog.py" line="67"/> - <source><b>Start Test</b><p>This button starts the selected testsuite.</p></source> - <translation><b>Запустить тесты</b><p>Запустить выбранный пакет тестов.</p></translation> - </message> - <message> - <location filename="../PyUnit/UnittestDialog.py" line="78"/> <source>Stop</source> <translation>Стоп</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="81"/> + <location filename="../PyUnit/UnittestDialog.py" line="83"/> <source><b>Stop Test</b><p>This button stops a running unittest.</p></source> <translation><b>Остановить</b><p>Остановить выполняющийся пакет тестов.</p></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="626"/> + <location filename="../PyUnit/UnittestDialog.py" line="628"/> <source>Show Source</source> <translation>Показать исходник</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="200"/> + <location filename="../PyUnit/UnittestDialog.py" line="202"/> <source>Python Files (*.py);;All Files (*)</source> <translation>Python файлы (*.py);;Все файлы (*)</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="196"/> + <location filename="../PyUnit/UnittestDialog.py" line="198"/> <source>Python3 Files ({1});;Python2 Files ({0});;All Files (*)</source> <translation>Python3 файлы ({1});;Python2 файлы ({0});;Все файлы (*)</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="487"/> + <location filename="../PyUnit/UnittestDialog.py" line="489"/> <source>Ran {0} test in {1:.3f}s</source> <translation>Тест {0} пройден за {1:.3f} секунд</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="490"/> + <location filename="../PyUnit/UnittestDialog.py" line="492"/> <source>Ran {0} tests in {1:.3f}s</source> <translation>{0} Тестов пройдено за {1:.3f} секунд</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="279"/> + <location filename="../PyUnit/UnittestDialog.ui" line="276"/> <source>Skipped:</source> <translation>Пропущено:</translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="286"/> + <location filename="../PyUnit/UnittestDialog.ui" line="283"/> <source>Number of tests skipped</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="296"/> + <location filename="../PyUnit/UnittestDialog.ui" line="293"/> <source>Expected Failures:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="303"/> + <location filename="../PyUnit/UnittestDialog.ui" line="300"/> <source>Number of tests with expected failure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="313"/> + <location filename="../PyUnit/UnittestDialog.ui" line="310"/> <source>Unexpected Successes:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="320"/> + <location filename="../PyUnit/UnittestDialog.ui" line="317"/> <source>Number of tests with unexpected success</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="536"/> + <location filename="../PyUnit/UnittestDialog.py" line="538"/> <source> Skipped: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="551"/> + <location filename="../PyUnit/UnittestDialog.py" line="553"/> <source> Expected Failure</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="565"/> + <location filename="../PyUnit/UnittestDialog.py" line="567"/> <source> Unexpected Success</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.py" line="70"/> - <source>Rerun Failed</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../PyUnit/UnittestDialog.py" line="72"/> - <source>Reruns failed tests of the selected testsuite</source> + <source>Rerun Failed</source> <translation type="unfinished"></translation> </message> <message> <location filename="../PyUnit/UnittestDialog.py" line="74"/> + <source>Reruns failed tests of the selected testsuite</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../PyUnit/UnittestDialog.py" line="76"/> <source><b>Rerun Failed</b><p>This button reruns all failed tests of the selected testsuite.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../PyUnit/UnittestDialog.ui" line="185"/> + <location filename="../PyUnit/UnittestDialog.ui" line="182"/> <source>%v/%m Tests</source> <translation type="unfinished"></translation> </message> @@ -57577,37 +59119,37 @@ <context> <name>UserInterface</name> <message> - <location filename="../UI/UserInterface.py" line="1342"/> + <location filename="../UI/UserInterface.py" line="1344"/> <source>Log-Viewer</source> <translation>Просмотрщик журнала</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1154"/> + <location filename="../UI/UserInterface.py" line="1156"/> <source>{0} - Passive Mode</source> <translation>{0} - пассивный режим</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1160"/> + <location filename="../UI/UserInterface.py" line="1162"/> <source>{0} - {1} - Passive Mode</source> <translation>{0} - {1} - пассивный режим</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1186"/> + <location filename="../UI/UserInterface.py" line="1188"/> <source>Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1186"/> + <location filename="../UI/UserInterface.py" line="1188"/> <source>&Quit</source> <translation>&Выход</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1192"/> + <location filename="../UI/UserInterface.py" line="1194"/> <source>Quit the IDE</source> <translation>Выход из IDE</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1193"/> + <location filename="../UI/UserInterface.py" line="1195"/> <source><b>Quit the IDE</b><p>This quits the IDE. Any unsaved changes may be saved first. Any Python program being debugged will be stopped and the preferences will be written to disc.</p></source> <translation><b>Выход из IDE</b> <p>Перед выходом все изменения могут быть сохранены. Отлаживаемая программа (если есть) будет остановлена, и настройки будут сохранены на диск.</p></translation> @@ -57629,230 +59171,230 @@ <p>Если окно Журнала скрыто, показать его. Иначе - закрыть.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1547"/> + <location filename="../UI/UserInterface.py" line="1549"/> <source>What's This?</source> <translation>Что это?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1547"/> + <location filename="../UI/UserInterface.py" line="1549"/> <source>&What's This?</source> <translation>&Что это?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1553"/> + <location filename="../UI/UserInterface.py" line="1555"/> <source>Context sensitive help</source> <translation>Контекстная помощь</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1554"/> + <location filename="../UI/UserInterface.py" line="1556"/> <source><b>Display context sensitive help</b><p>In What's This? mode, the mouse cursor shows an arrow with a question mark, and you can click on the interface elements to get a short description of what they do and how to use them. In dialogs, this feature can be accessed using the context help button in the titlebar.</p></source> <translation><b>Показать контекстную помощь</b> <p>В режиме контекстной помощи курсор мыши выглядит как стрелка со знаком вопроса, и, щёлкнув по элементу интерфейса, Вы можете просмотреть краткую помощь о его роли и его использовании. В диалогах можно воспользоваться кнопкой контекстной помощи в заголовке окна.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1565"/> + <location filename="../UI/UserInterface.py" line="1567"/> <source>Helpviewer</source> <translation>Просмотрщик помощи</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1565"/> + <location filename="../UI/UserInterface.py" line="1567"/> <source>&Helpviewer...</source> <translation>Просмотрщик помо&щи...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1571"/> + <location filename="../UI/UserInterface.py" line="1573"/> <source>Open the helpviewer window</source> <translation>Открыть просмотрщик помощи</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1590"/> + <location filename="../UI/UserInterface.py" line="1592"/> <source>Show Versions</source> <translation>Показать версию</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1590"/> + <location filename="../UI/UserInterface.py" line="1592"/> <source>Show &Versions</source> <translation>Показать &версию</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1594"/> - <source>Display version information</source> - <translation>Информация о версии</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1596"/> + <source>Display version information</source> + <translation>Информация о версии</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1598"/> <source><b>Show Versions</b><p>Display version information.</p></source> <translation><b>Показать версию</b><p>Информация о версии.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2566"/> + <location filename="../UI/UserInterface.py" line="2568"/> <source>Unittest</source> <translation>Unittest</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1668"/> + <location filename="../UI/UserInterface.py" line="1670"/> <source>&Unittest...</source> <translation>&Unittest...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1673"/> + <location filename="../UI/UserInterface.py" line="1675"/> <source>Start unittest dialog</source> <translation>Запустить unittest</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1918"/> + <location filename="../UI/UserInterface.py" line="1920"/> <source>Preferences</source> <translation>Предпочтения</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1918"/> + <location filename="../UI/UserInterface.py" line="1920"/> <source>&Preferences...</source> <translation>&Предпочтения...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1923"/> - <source>Set the prefered configuration</source> - <translation>Установите предпочтительную конфигурацию</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1925"/> + <source>Set the prefered configuration</source> + <translation>Установите предпочтительную конфигурацию</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1927"/> <source><b>Preferences</b><p>Set the configuration items of the application with your prefered values.</p></source> <translation><b>Предпочтения</b> <p>Настройте Eric по своему вкусу.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2444"/> + <location filename="../UI/UserInterface.py" line="2446"/> <source>&Window</source> <translation>&Окно</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2412"/> + <location filename="../UI/UserInterface.py" line="2414"/> <source>&Tools</source> <translation>&Сервис</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2404"/> + <location filename="../UI/UserInterface.py" line="2406"/> <source>Wi&zards</source> <translation>&Мастера</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2494"/> + <location filename="../UI/UserInterface.py" line="2496"/> <source>&Help</source> <translation>&Помощь</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2565"/> - <source>Tools</source> - <translation>Сервис</translation> - </message> - <message> - <location filename="../UI/UserInterface.py" line="4261"/> - <source>Help</source> - <translation>Помощь</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="2567"/> + <source>Tools</source> + <translation>Сервис</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="4269"/> + <source>Help</source> + <translation>Помощь</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="2569"/> <source>Settings</source> <translation>Настройка</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2469"/> + <location filename="../UI/UserInterface.py" line="2471"/> <source>&Toolbars</source> <translation>&Панели инструментов</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4382"/> + <location filename="../UI/UserInterface.py" line="4395"/> <source>Problem</source> <translation>Проблема</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4551"/> + <location filename="../UI/UserInterface.py" line="4570"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2023"/> + <location filename="../UI/UserInterface.py" line="2025"/> <source>Keyboard Shortcuts</source> <translation>Горячие клавиши</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2023"/> + <location filename="../UI/UserInterface.py" line="2025"/> <source>Keyboard &Shortcuts...</source> <translation>Горячие &клавиши...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2028"/> - <source>Set the keyboard shortcuts</source> - <translation>Задать горячие клавиши</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="2030"/> + <source>Set the keyboard shortcuts</source> + <translation>Задать горячие клавиши</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="2032"/> <source><b>Keyboard Shortcuts</b><p>Set the keyboard shortcuts of the application with your prefered values.</p></source> <translation><b>Горячие клавиши</b><p>Задайте горячие клавиши на свой вкус.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2399"/> + <location filename="../UI/UserInterface.py" line="2401"/> <source>E&xtras</source> <translation>До&полнительно</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2970"/> + <location filename="../UI/UserInterface.py" line="2972"/> <source>Report Bug</source> <translation>Сообщение об ошибке</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1641"/> + <location filename="../UI/UserInterface.py" line="1643"/> <source>Report &Bug...</source> <translation>Сообщить об &ошибке...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1645"/> + <location filename="../UI/UserInterface.py" line="1647"/> <source>Report a bug</source> <translation>Сообщить об ошибке</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1646"/> + <location filename="../UI/UserInterface.py" line="1648"/> <source><b>Report Bug...</b><p>Opens a dialog to report a bug.</p></source> <translation><b>Сообщить об ошибке...</b><p>Открывает диалог для сообщения об ошибке.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5261"/> + <location filename="../UI/UserInterface.py" line="5282"/> <source>Export Keyboard Shortcuts</source> <translation>Экспортировать горячие клавиши</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2038"/> + <location filename="../UI/UserInterface.py" line="2040"/> <source>&Export Keyboard Shortcuts...</source> <translation>&Экспортировать горячие клавиши...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2043"/> - <source>Export the keyboard shortcuts</source> - <translation>Экспортировать горячие клавиши</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="2045"/> + <source>Export the keyboard shortcuts</source> + <translation>Экспортировать горячие клавиши</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="2047"/> <source><b>Export Keyboard Shortcuts</b><p>Export the keyboard shortcuts of the application.</p></source> <translation><b>Экспортировать горячие клавиши</b> <p>Экспортировать горячие клавиши приложения.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5285"/> + <location filename="../UI/UserInterface.py" line="5306"/> <source>Import Keyboard Shortcuts</source> <translation>Импортировать горячие клавиши</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2052"/> + <location filename="../UI/UserInterface.py" line="2054"/> <source>&Import Keyboard Shortcuts...</source> <translation>&Импортировать горячие клавиши...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2057"/> - <source>Import the keyboard shortcuts</source> - <translation>Импортировать горячие клавиши</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="2059"/> + <source>Import the keyboard shortcuts</source> + <translation>Импортировать горячие клавиши</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="2061"/> <source><b>Import Keyboard Shortcuts</b><p>Import the keyboard shortcuts of the application.</p></source> <translation><b>Импортировать горячие клавиши</b> <p>Импортировать горячие клавиши приложения.</p></translation> @@ -57868,130 +59410,130 @@ <translation>Установка соединений...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="466"/> + <location filename="../UI/UserInterface.py" line="468"/> <source>Initializing Actions...</source> <translation>Инициализация действий...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="468"/> - <source>Initializing Menus...</source> - <translation>Инициализация меню...</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="470"/> - <source>Initializing Toolbars...</source> - <translation>Инициализация панелей инструментов...</translation> + <source>Initializing Menus...</source> + <translation>Инициализация меню...</translation> </message> <message> <location filename="../UI/UserInterface.py" line="472"/> + <source>Initializing Toolbars...</source> + <translation>Инициализация панелей инструментов...</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="474"/> <source>Initializing Statusbar...</source> <translation>Инициализация строки статуса...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="435"/> + <location filename="../UI/UserInterface.py" line="437"/> <source>Initializing Tools...</source> <translation>Инициализация инструментов...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1674"/> + <location filename="../UI/UserInterface.py" line="1676"/> <source><b>Unittest</b><p>Perform unit tests. The dialog gives you the ability to select and run a unittest suite.</p></source> <translation><b>Unittest</b> <p>Провести тесты. Диалог даёт возможность выбрать и провести набор тестов с помощью Unittest.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1682"/> + <location filename="../UI/UserInterface.py" line="1684"/> <source>Unittest Restart</source> <translation>Перезапустить Uniitest</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1687"/> + <location filename="../UI/UserInterface.py" line="1689"/> <source>Restart last unittest</source> <translation>Перезапустить последний Uniitest</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1688"/> + <location filename="../UI/UserInterface.py" line="1690"/> <source><b>Restart Unittest</b><p>Restart the unittest performed last.</p></source> <translation><b>Перезапустить Uniitest</b> <p>Перезапустить последний проведённый тест.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1712"/> + <location filename="../UI/UserInterface.py" line="1714"/> <source>Unittest Script</source> <translation>Unittest на сценарии</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1717"/> - <source>Run unittest with current script</source> - <translation>Выполнить Uniitest с текущим сценарием</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1719"/> + <source>Run unittest with current script</source> + <translation>Выполнить Uniitest с текущим сценарием</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1721"/> <source><b>Unittest Script</b><p>Run unittest with current script.</p></source> <translation><b>Сценарий Unittest</b><p>Выполнить Uniitest с текущим сценарием.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4011"/> + <location filename="../UI/UserInterface.py" line="4017"/> <source>Unittest Project</source> <translation>Uniitest на проекте</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1732"/> - <source>Run unittest with current project</source> - <translation>Выполнить Uniitest с текущим проектом</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1734"/> + <source>Run unittest with current project</source> + <translation>Выполнить Uniitest с текущим проектом</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1736"/> <source><b>Unittest Project</b><p>Run unittest with current project.</p></source> <translation><b>Сценарий Unittest</b><p>Выполнить Uniitest с текущим проектом.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2382"/> + <location filename="../UI/UserInterface.py" line="2384"/> <source>&Unittest</source> <translation>&Unittest</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4011"/> + <location filename="../UI/UserInterface.py" line="4017"/> <source>There is no main script defined for the current project. Aborting</source> <translation>Для текущего проекта не определён главный сценарий. Отмена</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1682"/> + <location filename="../UI/UserInterface.py" line="1684"/> <source>&Restart Unittest...</source> <translation>&Перезапустить Uniitest...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1712"/> + <location filename="../UI/UserInterface.py" line="1714"/> <source>Unittest &Script...</source> <translation>Unittest на &сценарии...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1727"/> + <location filename="../UI/UserInterface.py" line="1729"/> <source>Unittest &Project...</source> <translation>Uniitest на &проекте...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1822"/> + <location filename="../UI/UserInterface.py" line="1824"/> <source>Compare Files</source> <translation>Сравнить файлы</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1822"/> + <location filename="../UI/UserInterface.py" line="1824"/> <source>&Compare Files...</source> <translation>&Сравнить файлы...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1840"/> + <location filename="../UI/UserInterface.py" line="1842"/> <source>Compare two files</source> <translation>Сравнить два файла</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1828"/> + <location filename="../UI/UserInterface.py" line="1830"/> <source><b>Compare Files</b><p>Open a dialog to compare two files.</p></source> <translation><b>Сравнение файлов</b> <p>Открыть диалог для сравнения двух файлов.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1835"/> + <location filename="../UI/UserInterface.py" line="1837"/> <source>Compare Files side by side</source> <translation>Сравнить файлы с параллальным отображением (side by side)</translation> </message> @@ -58001,58 +59543,58 @@ <translation type="obsolete">Сравнить файлы с &параллальным отображением (side by side)...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1841"/> + <location filename="../UI/UserInterface.py" line="1843"/> <source><b>Compare Files side by side</b><p>Open a dialog to compare two files and show the result side by side.</p></source> <translation><b>Сравнить файлы с параллальным отображением (side by side)</b> <p>Открыть диалог, в котором показаны различия между файлами в две колонки.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5681"/> + <location filename="../UI/UserInterface.py" line="5703"/> <source>Drop Error</source> <translation>Ошибка Drag&&Drop</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="499"/> + <location filename="../UI/UserInterface.py" line="501"/> <source>Initializing Single Application Server...</source> <translation>Инициализируется сервер уникального приложения...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1163"/> + <location filename="../UI/UserInterface.py" line="1165"/> <source>{0} - {1} - {2} - Passive Mode</source> <translation>{0} - {1} - {2} - пассивный режим</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1325"/> + <location filename="../UI/UserInterface.py" line="1327"/> <source>File-Browser</source> <translation>Просмотрщик файлов</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1222"/> + <location filename="../UI/UserInterface.py" line="1224"/> <source>Edit Profile</source> <translation>Профиль редактирования</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1228"/> - <source>Activate the edit view profile</source> - <translation>Активизировать профиль редактирования</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1230"/> + <source>Activate the edit view profile</source> + <translation>Активизировать профиль редактирования</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1232"/> <source><b>Edit Profile</b><p>Activate the "Edit View Profile". Windows being shown, if this profile is active, may be configured with the "View Profile Configuration" dialog.</p></source> <translation><b>Профиль редактирования</b><p>Активизировать "профиль редактирования". Окна, отображаемые в этом профиле, можно настроить в диалоге "Конфигурация профилей".</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1239"/> + <location filename="../UI/UserInterface.py" line="1241"/> <source>Debug Profile</source> <translation>Профиль отладки</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1245"/> - <source>Activate the debug view profile</source> - <translation>Активизировать профиль отладки</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1247"/> + <source>Activate the debug view profile</source> + <translation>Активизировать профиль отладки</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1249"/> <source><b>Debug Profile</b><p>Activate the "Debug View Profile". Windows being shown, if this profile is active, may be configured with the "View Profile Configuration" dialog.</p></source> <translation><b>Профиль отладки</b><p>Активизировать "профиль отладки". Окна, отображаемые в этом профиле, можно настроить в диалоге "Конфигурация профилей".</p></translation> </message> @@ -58073,112 +59615,112 @@ <p>Если окно просмотрщика скрыто, показать его. Иначе - закрыть.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1991"/> + <location filename="../UI/UserInterface.py" line="1993"/> <source>View Profiles</source> <translation>Профили</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1991"/> + <location filename="../UI/UserInterface.py" line="1993"/> <source>&View Profiles...</source> <translation>&Профили...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1996"/> - <source>Configure view profiles</source> - <translation>Конфигурация профилей</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1998"/> + <source>Configure view profiles</source> + <translation>Конфигурация профилей</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="2000"/> <source><b>View Profiles</b><p>Configure the view profiles. With this dialog you may set the visibility of the various windows for the predetermined view profiles.</p></source> <translation><b>Профили</b><p>Конфигурация профилей. С помощью этого диалога вы можете устанавливать видимость разных окон для заданных профилей.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4382"/> + <location filename="../UI/UserInterface.py" line="4395"/> <source><p>The file <b>{0}</b> does not exist or is zero length.</p></source> <translation><p>Файл <b>{0}</b> либо не существует, либо нулевой длины.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4117"/> + <location filename="../UI/UserInterface.py" line="4123"/> <source><p>Could not start Qt-Designer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить Qt-Designer.<br>Убедитесь, что он доступен в <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4184"/> + <location filename="../UI/UserInterface.py" line="4190"/> <source><p>Could not start Qt-Linguist.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить Qt-Linguist.<br>Убедитесь, что он доступен в <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4233"/> + <location filename="../UI/UserInterface.py" line="4241"/> <source><p>Could not start Qt-Assistant.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить Qt-Assistant.<br>Убедитесь, что он доступен в <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4551"/> + <location filename="../UI/UserInterface.py" line="4570"/> <source><p>Could not start the tool entry <b>{0}</b>.<br>Ensure that it is available as <b>{1}</b>.</p></source> <translation><p>Невозможно запустить инструмент <b>{0}</b>.<br>Убедитесь, что он доступен в <b>{1}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5681"/> + <location filename="../UI/UserInterface.py" line="5703"/> <source><p><b>{0}</b> is not a file.</p></source> <translation><p><b>{0}</b> не является файлом</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1795"/> + <location filename="../UI/UserInterface.py" line="1797"/> <source>UI Previewer</source> <translation>Педпросмотр UI</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1795"/> + <location filename="../UI/UserInterface.py" line="1797"/> <source>&UI Previewer...</source> <translation>Педпросмотр &UI...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1800"/> + <location filename="../UI/UserInterface.py" line="1802"/> <source>Start the UI Previewer</source> <translation>Запустить UI Previewer</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1801"/> + <location filename="../UI/UserInterface.py" line="1803"/> <source><b>UI Previewer</b><p>Start the UI Previewer.</p></source> <translation><b>UI Previewer</b><p>Запустить the UI Previewer.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4341"/> + <location filename="../UI/UserInterface.py" line="4351"/> <source><p>Could not start UI Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить UI Previewer.<br>Убедитесь, что он находится в <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1808"/> + <location filename="../UI/UserInterface.py" line="1810"/> <source>Translations Previewer</source> <translation>Предпросмотр переводов</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1808"/> + <location filename="../UI/UserInterface.py" line="1810"/> <source>&Translations Previewer...</source> <translation>&Предпросмотр переводов...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1813"/> - <source>Start the Translations Previewer</source> - <translation>Запустить предпросмотр переводов</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1815"/> + <source>Start the Translations Previewer</source> + <translation>Запустить предпросмотр переводов</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1817"/> <source><b>Translations Previewer</b><p>Start the Translations Previewer.</p></source> <translation><b>Предпросмотр переводов</b><p>Запустить предпросмотр переводов.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4393"/> + <location filename="../UI/UserInterface.py" line="4406"/> <source><p>Could not start Translation Previewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить предпросмотр переводов.<br>Убедитесь, что он находится в <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1309"/> + <location filename="../UI/UserInterface.py" line="1311"/> <source>Shell</source> <translation>Оболочка</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1309"/> + <location filename="../UI/UserInterface.py" line="1311"/> <source>&Shell</source> <translation>&Оболочка</translation> </message> @@ -58194,27 +59736,27 @@ <p>Если окно Оболочки скрыто, показать его. Иначе - закрыть.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1962"/> + <location filename="../UI/UserInterface.py" line="1964"/> <source>Reload APIs</source> <translation>Перезагрузить API</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1962"/> + <location filename="../UI/UserInterface.py" line="1964"/> <source>Reload &APIs</source> <translation>Перезагрузить &API</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1966"/> - <source>Reload the API information</source> - <translation>Перезагрузить информацию об API</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1968"/> + <source>Reload the API information</source> + <translation>Перезагрузить информацию об API</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1970"/> <source><b>Reload APIs</b><p>Reload the API information.</p></source> <translation><b>Перезагрузить API</b><p>Перезагрузить информацию об API.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1360"/> + <location filename="../UI/UserInterface.py" line="1362"/> <source>Task-Viewer</source> <translation>Просмотрщик задач</translation> </message> @@ -58235,53 +59777,53 @@ <p>Если окно Задач скрыто, показать его. Иначе - закрыть.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5420"/> + <location filename="../UI/UserInterface.py" line="5441"/> <source>Save tasks</source> <translation>Сохранить задачи</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5420"/> + <location filename="../UI/UserInterface.py" line="5441"/> <source><p>The tasks file <b>{0}</b> could not be written.</p></source> <translation><p>Невозможно сохранить файл с задачами: <b>{0}</b></p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5446"/> + <location filename="../UI/UserInterface.py" line="5467"/> <source>Read tasks</source> <translation>Прочитать задачи</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5446"/> + <location filename="../UI/UserInterface.py" line="5467"/> <source><p>The tasks file <b>{0}</b> could not be read.</p></source> <translation><p>Невозможно прочитать файл с задачами: <b>{0}</b></p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4261"/> + <location filename="../UI/UserInterface.py" line="4269"/> <source>Currently no custom viewer is selected. Please use the preferences dialog to specify one.</source> <translation>Специальный просмотрщик не выбран. Используйте диалог с настройками для его выбора.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4275"/> + <location filename="../UI/UserInterface.py" line="4283"/> <source><p>Could not start custom viewer.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить специальный просмотрщик.<br>Убедитесь, что он находится в <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4994"/> + <location filename="../UI/UserInterface.py" line="5013"/> <source>Documentation Missing</source> <translation>Документация отсутствует</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4994"/> + <location filename="../UI/UserInterface.py" line="5013"/> <source><p>The documentation starting point "<b>{0}</b>" could not be found.</p></source> <translation><p>Корень документации "<b>{0}</b>" не найден.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2970"/> + <location filename="../UI/UserInterface.py" line="2972"/> <source>Email address or mail server address is empty. Please configure your Email settings in the Preferences Dialog.</source> <translation>Почтовый адрес или адрес почтового сервера пуст. Настройте электронную почту в диалоге конфигурации.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1378"/> + <location filename="../UI/UserInterface.py" line="1380"/> <source>Template-Viewer</source> <translation>Просмотрщик шаблонов</translation> </message> @@ -58297,12 +59839,12 @@ <p>Если окно просмотрщика скрыто, показать его. Иначе - закрыть.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1256"/> + <location filename="../UI/UserInterface.py" line="1258"/> <source>Alt+Shift+P</source> <translation>Alt+Shift+P</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1291"/> + <location filename="../UI/UserInterface.py" line="1293"/> <source>Alt+Shift+D</source> <translation>Alt+Shift+D</translation> </message> @@ -58312,7 +59854,7 @@ <translation type="obsolete">Активизировать Оболочку</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1309"/> + <location filename="../UI/UserInterface.py" line="1311"/> <source>Alt+Shift+S</source> <translation>Alt+Shift+S</translation> </message> @@ -58322,7 +59864,7 @@ <translation type="obsolete">Активизировать Просмотрщик файлов</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1325"/> + <location filename="../UI/UserInterface.py" line="1327"/> <source>Alt+Shift+F</source> <translation>Alt+Shift+F</translation> </message> @@ -58337,7 +59879,7 @@ <translation type="obsolete">Активизировать Просмотрщик задач</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1360"/> + <location filename="../UI/UserInterface.py" line="1362"/> <source>Alt+Shift+T</source> <translation>Alt+Shift+T</translation> </message> @@ -58347,32 +59889,32 @@ <translation type="obsolete">Активизировать Просмотрщик шаблонов</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1273"/> + <location filename="../UI/UserInterface.py" line="1275"/> <source>Alt+Shift+M</source> <translation>Alt+Shift+M</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2100"/> + <location filename="../UI/UserInterface.py" line="2102"/> <source>Activate current editor</source> <translation>Активизировать текущий редактор</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2100"/> + <location filename="../UI/UserInterface.py" line="2102"/> <source>Alt+Shift+E</source> <translation>Alt+Shift+E</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2110"/> + <location filename="../UI/UserInterface.py" line="2112"/> <source>Ctrl+Alt+Tab</source> <translation>Ctrl+Alt+Tab</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2119"/> + <location filename="../UI/UserInterface.py" line="2121"/> <source>Shift+Ctrl+Alt+Tab</source> <translation>Shift+Ctrl+Alt+Tab</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1342"/> + <location filename="../UI/UserInterface.py" line="1344"/> <source>Alt+Shift+G</source> <translation>Alt+Shift+G</translation> </message> @@ -58407,63 +59949,63 @@ <translation type="obsolete"><b>Qt-Лингвист 4</b><p>Запустить Qt-Лингвист 4.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2207"/> + <location filename="../UI/UserInterface.py" line="2209"/> <source>Qt4 Documentation</source> <translation>Документация Qt4</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2207"/> + <location filename="../UI/UserInterface.py" line="2209"/> <source>Qt&4 Documentation</source> <translation>Документация Qt&4</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2211"/> + <location filename="../UI/UserInterface.py" line="2213"/> <source>Open Qt4 Documentation</source> <translation>Открыть документацию Qt4</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2316"/> + <location filename="../UI/UserInterface.py" line="2318"/> <source>Eric API Documentation</source> <translation>Документация API Eric</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2316"/> + <location filename="../UI/UserInterface.py" line="2318"/> <source>&Eric API Documentation</source> <translation>Документация API &Eric</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2320"/> + <location filename="../UI/UserInterface.py" line="2322"/> <source>Open Eric API Documentation</source> <translation>Открыть документацию API Eric</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4295"/> + <location filename="../UI/UserInterface.py" line="4303"/> <source><p>Could not start the help viewer.<br>Ensure that it is available as <b>hh</b>.</p></source> <translation><p>Невозможно запустить просмотрщик помощи.<br>Убедитесь, что он доступен под именем <b>hh</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="446"/> + <location filename="../UI/UserInterface.py" line="448"/> <source>Registering Objects...</source> <translation>Регистрация объектов...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1256"/> + <location filename="../UI/UserInterface.py" line="1258"/> <source>Project-Viewer</source> <translation>Просмотрщик проекта</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1291"/> + <location filename="../UI/UserInterface.py" line="1293"/> <source>Debug-Viewer</source> <translation>Просмотрщик отладки</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1186"/> + <location filename="../UI/UserInterface.py" line="1188"/> <source>Ctrl+Q</source> <comment>File|Quit</comment> <translation>Ctrl+Q</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1256"/> + <location filename="../UI/UserInterface.py" line="1258"/> <source>&Project-Viewer</source> <translation>&Просмотрщик проекта</translation> </message> @@ -58484,22 +60026,22 @@ <translation type="obsolete">Активизировать Просмотрщик проекта</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1547"/> + <location filename="../UI/UserInterface.py" line="1549"/> <source>Shift+F1</source> <translation>Shift+F1</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1565"/> + <location filename="../UI/UserInterface.py" line="1567"/> <source>F1</source> <translation>F1</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1606"/> + <location filename="../UI/UserInterface.py" line="1608"/> <source>Check for Updates</source> <translation>Проверить наличие обновлений</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1603"/> + <location filename="../UI/UserInterface.py" line="1605"/> <source>Check for &Updates...</source> <translation>Проверить наличие &обновлений...</translation> </message> @@ -58510,7 +60052,7 @@ <p>Отобразить документацию Qt4. В зависимости от настроек, она отобразится либо во встроенном просмотрщике помощи Eric, либо вызовет интернет-браузер, либо Qt Assistant.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2235"/> + <location filename="../UI/UserInterface.py" line="2237"/> <source>PyQt4 Documentation</source> <translation>Документация PyQt4</translation> </message> @@ -58520,7 +60062,7 @@ <translation type="obsolete">Документация P&yQt4</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2239"/> + <location filename="../UI/UserInterface.py" line="2241"/> <source>Open PyQt4 Documentation</source> <translation>Открыть документацию Qt4</translation> </message> @@ -58531,65 +60073,65 @@ <p>Отобразить документацию PyQt4. В зависимости от настроек, она отобразится либо во встроенном просмотрщике помощи Eric, либо вызовет интернет-браузер, либо Qt Assistant.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2415"/> + <location filename="../UI/UserInterface.py" line="2417"/> <source>Select Tool Group</source> <translation>Выберите группу инструментов</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2421"/> + <location filename="../UI/UserInterface.py" line="2423"/> <source>Se&ttings</source> <translation>&Настройка</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2569"/> + <location filename="../UI/UserInterface.py" line="2571"/> <source>Profiles</source> <translation>Профили</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3331"/> + <location filename="../UI/UserInterface.py" line="3333"/> <source>&Builtin Tools</source> <translation>&Встроенные инструменты</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4535"/> + <location filename="../UI/UserInterface.py" line="4554"/> <source>Starting process '{0} {1}'. </source> <translation>Запускается процесс '{0} {1}'. </translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4627"/> + <location filename="../UI/UserInterface.py" line="4646"/> <source>Process '{0}' has exited. </source> <translation>Процесс '{0}' завершился.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4978"/> + <location filename="../UI/UserInterface.py" line="4997"/> <source>Documentation</source> <translation>Документация</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4820"/> + <location filename="../UI/UserInterface.py" line="4839"/> <source><p>The PyQt4 documentation starting point has not been configured.</p></source> <translation><p>Корень документации PyQt4 не найден.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5991"/> + <location filename="../UI/UserInterface.py" line="6014"/> <source>Error during updates check</source> <translation>Ошибка при проверке обновлений</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5971"/> + <location filename="../UI/UserInterface.py" line="5994"/> <source>Update available</source> <translation>Обновления доступны</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2919"/> + <location filename="../UI/UserInterface.py" line="2921"/> <source><h3>Version Numbers</h3><table></source> <translation><h3>Номера версий</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6028"/> + <location filename="../UI/UserInterface.py" line="6051"/> <source></table></source> <translation></table></translation> </message> @@ -58604,42 +60146,42 @@ <translation type="obsolete"><p>Невозможно прочитать файл таблиц стилей Qt <b>{0}</b>.<br>{1}</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3277"/> + <location filename="../UI/UserInterface.py" line="3279"/> <source>Configure Tool Groups ...</source> <translation>Настроить группы Инструментов...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3281"/> + <location filename="../UI/UserInterface.py" line="3283"/> <source>Configure current Tool Group ...</source> <translation>Настроить текущую группу Инструментов...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1980"/> + <location filename="../UI/UserInterface.py" line="1982"/> <source>Show external tools</source> <translation>Показать внешние инструменты</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1975"/> + <location filename="../UI/UserInterface.py" line="1977"/> <source>Show external &tools</source> <translation>Показать &внешние инструменты</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5991"/> + <location filename="../UI/UserInterface.py" line="6014"/> <source>Could not perform updates check.</source> <translation>Невозможно запустить проверку обновлений.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5823"/> + <location filename="../UI/UserInterface.py" line="5846"/> <source>&Cancel</source> <translation>От&мена</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5830"/> + <location filename="../UI/UserInterface.py" line="5853"/> <source>Trying host {0}</source> <translation>Пробую узел {0}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6055"/> + <location filename="../UI/UserInterface.py" line="6078"/> <source>First time usage</source> <translation>Первое использование</translation> </message> @@ -58649,83 +60191,83 @@ <translation>Инициализируется менеджер расширений...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2480"/> + <location filename="../UI/UserInterface.py" line="2482"/> <source>P&lugins</source> <translation>&Расширения</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2570"/> + <location filename="../UI/UserInterface.py" line="2572"/> <source>Plugins</source> <translation>Расширения</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2137"/> + <location filename="../UI/UserInterface.py" line="2139"/> <source>Plugin Infos</source> <translation>Информация о расширениях</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2141"/> + <location filename="../UI/UserInterface.py" line="2143"/> <source>Show Plugin Infos</source> <translation>Показать информацию о расширениях</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2142"/> + <location filename="../UI/UserInterface.py" line="2144"/> <source><b>Plugin Infos...</b><p>This opens a dialog, that show some information about loaded plugins.</p></source> <translation><b>Информация о расширениях...</b> <p>Открывает диалог, отображающий информацию о загруженных расширениях.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2137"/> + <location filename="../UI/UserInterface.py" line="2139"/> <source>&Plugin Infos...</source> <translation>Ин&формация о подключаемых модулях...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2168"/> + <location filename="../UI/UserInterface.py" line="2170"/> <source>Uninstall Plugin</source> <translation>Убрать подключаемый модуль</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2163"/> + <location filename="../UI/UserInterface.py" line="2165"/> <source>&Uninstall Plugin...</source> <translation>У&брать подключаемый модуль...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2169"/> + <location filename="../UI/UserInterface.py" line="2171"/> <source><b>Uninstall Plugin...</b><p>This opens a dialog to uninstall a plugin.</p></source> <translation><b>Убрать подключаемый модуль...</b><p>Открывает диалог деинсталляции нового подключаемого модуля.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3339"/> + <location filename="../UI/UserInterface.py" line="3341"/> <source>&Plugin Tools</source> <translation>Инструменты для &плагинов</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3429"/> - <source>&Show all</source> - <translation>Показать &всё</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="3431"/> + <source>&Show all</source> + <translation>Показать &всё</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="3433"/> <source>&Hide all</source> <translation>Ск&рыть всё</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="508"/> + <location filename="../UI/UserInterface.py" line="510"/> <source>Activating Plugins...</source> <translation>Активация подключаемых модулей...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1614"/> + <location filename="../UI/UserInterface.py" line="1616"/> <source>Show downloadable versions</source> <translation>Показать версии, доступные для загрузки</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1614"/> + <location filename="../UI/UserInterface.py" line="1616"/> <source>Show &downloadable versions...</source> <translation>Показать версии, доступные для &загрузки...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1618"/> + <location filename="../UI/UserInterface.py" line="1620"/> <source>Show the versions available for download</source> <translation>Показать версии, доступные для загрузки</translation> </message> @@ -58740,57 +60282,57 @@ <translation type="obsolete">Невозможно скачать файл версий.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6014"/> + <location filename="../UI/UserInterface.py" line="6037"/> <source><h3>Available versions</h3><table></source> <translation><h3>Доступные версии</h3><table></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2176"/> + <location filename="../UI/UserInterface.py" line="2178"/> <source>Plugin Repository</source> <translation>Репозиторий плагинов</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2176"/> + <location filename="../UI/UserInterface.py" line="2178"/> <source>Plugin &Repository...</source> <translation>&Репозиторий плагинов...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2181"/> - <source>Show Plugins available for download</source> - <translation>Показать плагины, доступные для загрузки</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="2183"/> + <source>Show Plugins available for download</source> + <translation>Показать плагины, доступные для загрузки</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="2185"/> <source><b>Plugin Repository...</b><p>This opens a dialog, that shows a list of plugins available on the Internet.</p></source> <translation><b>Репозиторий плагинов...</b><p>Открывает диалог, который показывает список плагинов, доступных для скачивания с интернета.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2155"/> + <location filename="../UI/UserInterface.py" line="2157"/> <source>Install Plugins</source> <translation>Установить плагины</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2150"/> + <location filename="../UI/UserInterface.py" line="2152"/> <source>&Install Plugins...</source> <translation>&Установить плагины...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2156"/> + <location filename="../UI/UserInterface.py" line="2158"/> <source><b>Install Plugins...</b><p>This opens a dialog to install or update plugins.</p></source> <translation><b>Установить плагины...</b><p>Открывает диалог для установки или обновления плагинов.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1867"/> + <location filename="../UI/UserInterface.py" line="1869"/> <source>Mini Editor</source> <translation>Мини-редактор</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1862"/> + <location filename="../UI/UserInterface.py" line="1864"/> <source>Mini &Editor...</source> <translation>Мини-&редактор...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1868"/> + <location filename="../UI/UserInterface.py" line="1870"/> <source><b>Mini Editor</b><p>Open a dialog with a simplified editor.</p></source> <translation><b>Мини-редактор</b><p>Открывает диалог с упрощённым редактором.</p></translation> </message> @@ -58805,57 +60347,57 @@ <translation type="obsolete">&Лингвист 4...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2008"/> + <location filename="../UI/UserInterface.py" line="2010"/> <source>Toolbars</source> <translation>Панели инструментов</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2008"/> + <location filename="../UI/UserInterface.py" line="2010"/> <source>Tool&bars...</source> <translation>Панели &инструментов...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2013"/> + <location filename="../UI/UserInterface.py" line="2015"/> <source>Configure toolbars</source> <translation>Настроить панели инструментов</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2014"/> + <location filename="../UI/UserInterface.py" line="2016"/> <source><b>Toolbars</b><p>Configure the toolbars. With this dialog you may change the actions shown on the various toolbars and define your own toolbars.</p></source> <translation><b>Панели инструментов</b><p>Настроить панели инструментов. В этом диалоге Вы можете изменить имеющиеся панели инструментов, а так же создать новые.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="516"/> + <location filename="../UI/UserInterface.py" line="518"/> <source>Restoring Toolbarmanager...</source> <translation>Восстановление менеджера панелей инструментов...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2822"/> + <location filename="../UI/UserInterface.py" line="2824"/> <source>External Tools/{0}</source> <translation>Внешние инструменты/{0}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4496"/> + <location filename="../UI/UserInterface.py" line="4515"/> <source>External Tools</source> <translation>Внешние инструменты</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4487"/> + <location filename="../UI/UserInterface.py" line="4506"/> <source>No tool entry found for external tool '{0}' in tool group '{1}'.</source> <translation>Запись для внешней программы '{0}' не найдена в группе '{1}'.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4496"/> + <location filename="../UI/UserInterface.py" line="4515"/> <source>No toolgroup entry '{0}' found.</source> <translation>Запись для группы '{0}' не найдена.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1273"/> + <location filename="../UI/UserInterface.py" line="1275"/> <source>Multiproject-Viewer</source> <translation>Просмотрщик мултипроекта</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1273"/> + <location filename="../UI/UserInterface.py" line="1275"/> <source>&Multiproject-Viewer</source> <translation>Просмотрщик &мултипроекта</translation> </message> @@ -58880,32 +60422,32 @@ <translation type="obsolete">Просмотрщик &шаблонов</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5464"/> + <location filename="../UI/UserInterface.py" line="5485"/> <source>Save session</source> <translation>Сохранить сессию</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5464"/> + <location filename="../UI/UserInterface.py" line="5485"/> <source><p>The session file <b>{0}</b> could not be written.</p></source> <translation><p>Не могу записать файл сессии <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5492"/> + <location filename="../UI/UserInterface.py" line="5513"/> <source>Read session</source> <translation>Загрузить сессию</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5492"/> + <location filename="../UI/UserInterface.py" line="5513"/> <source><p>The session file <b>{0}</b> could not be read.</p></source> <translation><p>Не могу прочитать файл сессии <b>{0}</b>.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2724"/> + <location filename="../UI/UserInterface.py" line="2726"/> <source><p>This part of the status bar displays the current editors encoding.</p></source> <translation><p>Эта часть строки статуса показывает текущую кодировку редактора.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2738"/> + <location filename="../UI/UserInterface.py" line="2740"/> <source><p>This part of the status bar displays an indication of the current editors files writability.</p></source> <translation><p>Эта часть строки статуса указывает на возможность записи открытого в редакторе файла.</p></translation> </message> @@ -58920,27 +60462,27 @@ <translation type="obsolete"><p>Ошибки SSL: </p><p>{0}</p><p>Игнорировать?</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1653"/> + <location filename="../UI/UserInterface.py" line="1655"/> <source>Request Feature</source> <translation>Послать запрос</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1653"/> + <location filename="../UI/UserInterface.py" line="1655"/> <source>Request &Feature...</source> <translation>Послать &запрос...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1657"/> - <source>Send a feature request</source> - <translation>Послать запрос</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1659"/> + <source>Send a feature request</source> + <translation>Послать запрос</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1661"/> <source><b>Request Feature...</b><p>Opens a dialog to send a feature request.</p></source> <translation><b>Послать запрос...</b><p>Показать диалог создания запроса.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2717"/> + <location filename="../UI/UserInterface.py" line="2719"/> <source><p>This part of the status bar displays the current editors language.</p></source> <translation><p>Эта часть строки статуса показывает язык текущего окна редактора.</p></translation> </message> @@ -58950,12 +60492,12 @@ <translation type="obsolete"><p>Эта часть строки статуса показывает имя файла открытого в текущем редакторе.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2745"/> + <location filename="../UI/UserInterface.py" line="2747"/> <source><p>This part of the status bar displays the line number of the current editor.</p></source> <translation><p>Эта часть строки статуса показывает номер текущей строки в редакторе.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2752"/> + <location filename="../UI/UserInterface.py" line="2754"/> <source><p>This part of the status bar displays the cursor position of the current editor.</p></source> <translation><p>Эта часть строки статуса показывает текущую позицию курсора в редакторе.</p></translation> </message> @@ -58965,7 +60507,7 @@ <translation type="obsolete">Вертикальная панель инструментов</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1421"/> + <location filename="../UI/UserInterface.py" line="1423"/> <source>Horizontal Toolbox</source> <translation>Горизонтальная панель инструментов</translation> </message> @@ -58985,27 +60527,27 @@ <translation type="obsolete"><b>Переключить вертикальную панель инструментов</b><p>Показать/скрыть вертикальную панель инструментов</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1421"/> + <location filename="../UI/UserInterface.py" line="1423"/> <source>&Horizontal Toolbox</source> <translation>&Горизонтальная панель инструментов</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1425"/> - <source>Toggle the Horizontal Toolbox window</source> - <translation>Переключить горизонтальную панель инструментов</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1427"/> + <source>Toggle the Horizontal Toolbox window</source> + <translation>Переключить горизонтальную панель инструментов</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1429"/> <source><b>Toggle the Horizontal Toolbox window</b><p>If the Horizontal Toolbox window is hidden then display it. If it is displayed then close it.</p></source> <translation><b>Переключить горизонтальную панель инструментов</b><p>Показать/скрыть горизонтальную панель инструментов</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3243"/> + <location filename="../UI/UserInterface.py" line="3245"/> <source>Restart application</source> <translation>Перезапустить приложение</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="3243"/> + <location filename="../UI/UserInterface.py" line="3245"/> <source>The application needs to be restarted. Do it now?</source> <translation>Необходимо перезапустить приложение. Сделать это сейчас?</translation> </message> @@ -59036,124 +60578,124 @@ <translation type="obsolete">Активизировать Оболочку</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1378"/> + <location filename="../UI/UserInterface.py" line="1380"/> <source>Alt+Shift+A</source> <translation></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2489"/> + <location filename="../UI/UserInterface.py" line="2491"/> <source>Configure...</source> <translation>Настроить...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2731"/> + <location filename="../UI/UserInterface.py" line="2733"/> <source><p>This part of the status bar displays the current editors eol setting.</p></source> <translation><p>Эта часть строки статуса показывает режим конца строки в текущем редакторе.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2128"/> + <location filename="../UI/UserInterface.py" line="2130"/> <source>Switch between tabs</source> <translation>Переключиться между закладками</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2128"/> + <location filename="../UI/UserInterface.py" line="2130"/> <source>Ctrl+1</source> <translation>Ctrl+1</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1934"/> + <location filename="../UI/UserInterface.py" line="1936"/> <source>Export Preferences</source> <translation>Экспорт предпочтений</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1934"/> + <location filename="../UI/UserInterface.py" line="1936"/> <source>E&xport Preferences...</source> <translation>&Экспорт предпочтений...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1939"/> - <source>Export the current configuration</source> - <translation>Экспорт текущих настроек</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1941"/> + <source>Export the current configuration</source> + <translation>Экспорт текущих настроек</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1943"/> <source><b>Export Preferences</b><p>Export the current configuration to a file.</p></source> <translation><b>Экспорт предпочтений</b><p>Экспорт текущих предпочтений в файл.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1948"/> + <location filename="../UI/UserInterface.py" line="1950"/> <source>Import Preferences</source> <translation>Импорт предпочтений</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1948"/> + <location filename="../UI/UserInterface.py" line="1950"/> <source>I&mport Preferences...</source> <translation>&Импорт предпочтений...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1953"/> - <source>Import a previously exported configuration</source> - <translation>Импорт сохранённых ранее настроек</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1955"/> + <source>Import a previously exported configuration</source> + <translation>Импорт сохранённых ранее настроек</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1957"/> <source><b>Import Preferences</b><p>Import a previously exported configuration.</p></source> <translation><b>Импорт настроек</b><p>Импорт сохранённых ранее настроек.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2110"/> + <location filename="../UI/UserInterface.py" line="2112"/> <source>Show next</source> <translation>Показать следующую закладку</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2119"/> + <location filename="../UI/UserInterface.py" line="2121"/> <source>Show previous</source> <translation>Показать предыдущую закладку</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1435"/> + <location filename="../UI/UserInterface.py" line="1437"/> <source>Left Sidebar</source> <translation>Левая док-панель</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1435"/> + <location filename="../UI/UserInterface.py" line="1437"/> <source>&Left Sidebar</source> <translation>&Левая док-панель</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1439"/> + <location filename="../UI/UserInterface.py" line="1441"/> <source>Toggle the left sidebar window</source> <translation>Показать/скрыть левую док-панель</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1440"/> + <location filename="../UI/UserInterface.py" line="1442"/> <source><b>Toggle the left sidebar window</b><p>If the left sidebar window is hidden then display it. If it is displayed then close it.</p></source> <translation><b>Показать/скрыть левую док-панель</b> <p>Если левая док-панель скрыта, показать её. Иначе - закрыть.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1462"/> + <location filename="../UI/UserInterface.py" line="1464"/> <source>Bottom Sidebar</source> <translation>Нижняя док-панель</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1462"/> + <location filename="../UI/UserInterface.py" line="1464"/> <source>&Bottom Sidebar</source> <translation>&Нижняя док-панель</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1466"/> - <source>Toggle the bottom sidebar window</source> - <translation>Показать/скрыть нижнюю док-панель</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1468"/> + <source>Toggle the bottom sidebar window</source> + <translation>Показать/скрыть нижнюю док-панель</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1470"/> <source><b>Toggle the bottom sidebar window</b><p>If the bottom sidebar window is hidden then display it. If it is displayed then close it.</p></source> <translation><b>Показать/скрыть нижнюю док-панель</b> <p>Если нижняя док-панель скрыта, показать её. Иначе - закрыть.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1291"/> + <location filename="../UI/UserInterface.py" line="1293"/> <source>&Debug-Viewer</source> <translation>&Просмотрщик отладки</translation> </message> @@ -59174,27 +60716,27 @@ <translation type="obsolete">Активизировать Просмотрщик отладки</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1849"/> + <location filename="../UI/UserInterface.py" line="1851"/> <source>SQL Browser</source> <translation>Просмотрщик SQL</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1849"/> + <location filename="../UI/UserInterface.py" line="1851"/> <source>SQL &Browser...</source> <translation>&Просмотрщик SQL...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1854"/> + <location filename="../UI/UserInterface.py" line="1856"/> <source>Browse a SQL database</source> <translation>Просмотреть SQL базу данных</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1855"/> + <location filename="../UI/UserInterface.py" line="1857"/> <source><b>SQL Browser</b><p>Browse a SQL database.</p></source> <translation><b>Просмотрщик SQL</b><p>Просмотреть SQL базу данных.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4414"/> + <location filename="../UI/UserInterface.py" line="4427"/> <source><p>Could not start SQL Browser.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation><p>Невозможно запустить просмотрщик SQL.<br>Убедитесь, что он доступен как <b>{0}</b>.</p></translation> </message> @@ -59234,17 +60776,17 @@ <translation type="obsolete">Просмотрщик &Web...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1889"/> + <location filename="../UI/UserInterface.py" line="1891"/> <source>Icon Editor</source> <translation>Редактор иконок</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1889"/> + <location filename="../UI/UserInterface.py" line="1891"/> <source>&Icon Editor...</source> <translation>Редактор &иконок...</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4208"/> + <location filename="../UI/UserInterface.py" line="4216"/> <source>Qt 3 support</source> <translation>Поддержка Qt3</translation> </message> @@ -59254,42 +60796,42 @@ <translation type="obsolete"><b>Документация PySide</b><p>Показать документацию PySide. В зависимости от настроек документация будет показана или во внутреннем просмотрщике помощи, в WEB просмотрщике или в Qt Assistant. </p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4978"/> + <location filename="../UI/UserInterface.py" line="4997"/> <source><p>The PySide documentation starting point has not been configured.</p></source> <translation><p>Корень документации PySide не найден.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2337"/> + <location filename="../UI/UserInterface.py" line="2339"/> <source>PySide Documentation</source> <translation>Документация PySide</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2337"/> + <location filename="../UI/UserInterface.py" line="2339"/> <source>Py&Side Documentation</source> <translation>Документация Py&Side</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2341"/> + <location filename="../UI/UserInterface.py" line="2343"/> <source>Open PySide Documentation</source> <translation>Открыть документацию PySide</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1573"/> + <location filename="../UI/UserInterface.py" line="1575"/> <source><b>Helpviewer</b><p>Display the eric5 web browser. This window will show HTML help files and help from Qt help collections. It has the capability to navigate to links, set bookmarks, print the displayed help and some more features. You may use it to browse the internet as well</p><p>If called with a word selected, this word is search in the Qt help collection.</p></source> <translation><b>Просмотрщик помощи</b><p>Открыть eric5 просмотрщик Web. Это окно будет показывать HTML файлы помощи. Оно поддерживает навигацию по ссылкам, закладки, печать и некоторые другие функции. Его можно использовать для просмотра интернета.</p><p>Если перед открытием просмотрщика помощи был подсвечен какой-либо текст, то будет произведён поиск этого текста в коллекции помощи Qt.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1607"/> + <location filename="../UI/UserInterface.py" line="1609"/> <source><b>Check for Updates...</b><p>Checks the internet for updates of eric5.</p></source> <translation><b>Проверить наличие обновлений...</b><p>Проверить наличие обновлений eric5 в интернет.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1620"/> + <location filename="../UI/UserInterface.py" line="1622"/> <source><b>Show downloadable versions...</b><p>Shows the eric5 versions available for download from the internet.</p></source> <translation><b>Показать версии, доступные для загрузки...</b><p>Показывает версии eric5, которые можно скачать с интернета.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1880"/> + <location filename="../UI/UserInterface.py" line="1882"/> <source>Start the eric5 Web Browser</source> <translation>Запустить WEB просмотрщик встроенный в Eric5</translation> </message> @@ -59299,52 +60841,52 @@ <translation type="obsolete"><b>Просмотрщик Web</b><p>Запустить WEB просмотрщик встроенный в Eric5.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1894"/> + <location filename="../UI/UserInterface.py" line="1896"/> <source>Start the eric5 Icon Editor</source> <translation>Запустить редактор иконок</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1896"/> + <location filename="../UI/UserInterface.py" line="1898"/> <source><b>Icon Editor</b><p>Starts the eric5 Icon Editor for editing simple icons.</p></source> <translation><b>Редактор иконок</b><p>Запустить редактор иконок.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1982"/> + <location filename="../UI/UserInterface.py" line="1984"/> <source><b>Show external tools</b><p>Opens a dialog to show the path and versions of all extenal tools used by eric5.</p></source> <translation><b>Показать внешние инструменты</b><p>Открывает диалог для отображения пути и версий внешних инструментов, используемых eric5.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2322"/> + <location filename="../UI/UserInterface.py" line="2324"/> <source><b>Eric API Documentation</b><p>Display the Eric API documentation. The location for the documentation is the Documentation/Source subdirectory of the eric5 installation directory.</p></source> <translation><b>Документация Eric API</b><p>Показать документацию Eric API. Местонахождение документации - каталог Documentation/Source, расположенный в каталоге инсталляции eric5.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4208"/> + <location filename="../UI/UserInterface.py" line="4216"/> <source>Qt v.3 is not supported by eric5.</source> <translation>Qt3 не поддерживается в eric5.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5971"/> + <location filename="../UI/UserInterface.py" line="5994"/> <source>The update to <b>{0}</b> of eric5 is available at <b>{1}</b>. Would you like to get it?</source> <translation>На сайте <b>{1}</b> доступно обновление eric5 до версии <b>{0}</b>. Скачать?</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5984"/> + <location filename="../UI/UserInterface.py" line="6007"/> <source>Eric5 is up to date</source> <translation>Eric5 не требует обновлений</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5984"/> + <location filename="../UI/UserInterface.py" line="6007"/> <source>You are using the latest version of eric5</source> <translation>Вы используете самую последнюю версию eric5</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6055"/> + <location filename="../UI/UserInterface.py" line="6078"/> <source>eric5 has not been configured yet. The configuration dialog will be started.</source> <translation>eric5 ещё не сконфигурирован. Будет запущен диалог конфигурации.</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="804"/> + <location filename="../UI/UserInterface.py" line="806"/> <source>Cooperation</source> <translation>Кооперация</translation> </message> @@ -59369,12 +60911,12 @@ <translation type="obsolete">Активизировать Просмотрщик Коопераци</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1476"/> + <location filename="../UI/UserInterface.py" line="1478"/> <source>Alt+Shift+O</source> <translation>Alt+Shift+O</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="861"/> + <location filename="../UI/UserInterface.py" line="863"/> <source>Symbols</source> <translation>Символы</translation> </message> @@ -59400,12 +60942,12 @@ <translation type="obsolete">Активизировать просмотрщик символов</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1511"/> + <location filename="../UI/UserInterface.py" line="1513"/> <source>Alt+Shift+Y</source> <translation>Alt+Shift+Y</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="869"/> + <location filename="../UI/UserInterface.py" line="871"/> <source>Numbers</source> <translation>Числа</translation> </message> @@ -59431,27 +60973,27 @@ <translation type="obsolete">Активизировать просмотрщик чисел</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1529"/> + <location filename="../UI/UserInterface.py" line="1531"/> <source>Alt+Shift+B</source> <translation></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5285"/> + <location filename="../UI/UserInterface.py" line="5306"/> <source>Keyboard shortcut file (*.e4k)</source> <translation>Файл горячих клавиш (*.e4k)</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2274"/> + <location filename="../UI/UserInterface.py" line="2276"/> <source>Python 3 Documentation</source> <translation>Документация Pyton 3</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2274"/> + <location filename="../UI/UserInterface.py" line="2276"/> <source>Python &3 Documentation</source> <translation>Документация Pyton &3</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2278"/> + <location filename="../UI/UserInterface.py" line="2280"/> <source>Open Python 3 Documentation</source> <translation>Открыть документацию Python 3</translation> </message> @@ -59461,468 +61003,468 @@ <translation type="obsolete"><b>Документация Pyton 3</b><p>Показать Pyton 3 документацию. Если местонахождение документации не было настроено, то искать в подкаталоге <i>doc</i> каталога где находится исполняемый файл Python 3 под Windows и в подкаталоге <i>/usr/share/doc/packages/python/html</i> под UNIX. Местонахождение документации можно задать с помощью переменной окружения PYTHON3DOCDIR.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2292"/> + <location filename="../UI/UserInterface.py" line="2294"/> <source>Python 2 Documentation</source> <translation>Документация Pyton 2</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2292"/> + <location filename="../UI/UserInterface.py" line="2294"/> <source>Python &2 Documentation</source> <translation>Документация Pyton &2</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2296"/> - <source>Open Python 2 Documentation</source> - <translation>Открыть документацию Python 2</translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="2298"/> + <source>Open Python 2 Documentation</source> + <translation>Открыть документацию Python 2</translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="2300"/> <source><b>Python 2 Documentation</b><p>Display the Python 2 documentation. If no documentation directory is configured, the location of the Python 2 documentation is assumed to be the doc directory underneath the location of the configured Python 2 executable on Windows and <i>/usr/share/doc/packages/python/html/python-docs-html</i> on Unix. Set PYTHON2DOCDIR in your environment to override this. </p></source> <translation><b>Документация Pyton 2</b><p>Показать Pyton 2 документацию. Если местонахождение документации не было настроено, то искать в подкаталоге <i>doc</i> каталога где находится исполняемый файл Python 2 под Windows и в подкаталоге <i>/usr/share/doc/packages/python/html/python-docs-html</i> под UNIX. Местонахождение документации можно задать с помощью переменной окружения PYTHON2DOCDIR.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5881"/> + <location filename="../UI/UserInterface.py" line="5904"/> <source>Error getting versions information</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5874"/> + <location filename="../UI/UserInterface.py" line="5897"/> <source>The versions information could not be downloaded. Please go online and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5087"/> + <location filename="../UI/UserInterface.py" line="5106"/> <source>Open Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5087"/> + <location filename="../UI/UserInterface.py" line="5106"/> <source>Could not start a web browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5881"/> + <location filename="../UI/UserInterface.py" line="5904"/> <source>The versions information could not be downloaded for the last 7 days. Please go online and try again.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1875"/> + <location filename="../UI/UserInterface.py" line="1877"/> <source>eric5 Web Browser</source> <translation>WEB просмотрщик встроенный в Eric5</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1875"/> + <location filename="../UI/UserInterface.py" line="1877"/> <source>eric5 &Web Browser...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1882"/> + <location filename="../UI/UserInterface.py" line="1884"/> <source><b>eric5 Web Browser</b><p>Browse the Internet with the eric5 Web Browser.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="521"/> + <location filename="../UI/UserInterface.py" line="523"/> <source>Setting View Profile...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="525"/> + <location filename="../UI/UserInterface.py" line="527"/> <source>Reading Tasks...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="529"/> + <location filename="../UI/UserInterface.py" line="531"/> <source>Reading Templates...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="533"/> + <location filename="../UI/UserInterface.py" line="535"/> <source>Starting Debugger...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1203"/> + <location filename="../UI/UserInterface.py" line="1205"/> <source>New Window</source> <translation>Новое окно</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1203"/> + <location filename="../UI/UserInterface.py" line="1205"/> <source>New &Window</source> <translation>&Новое окно</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1203"/> + <location filename="../UI/UserInterface.py" line="1205"/> <source>Ctrl+Shift+N</source> <comment>File|New Window</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1209"/> - <source>Open a new eric5 instance</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1211"/> + <source>Open a new eric5 instance</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1213"/> <source><b>New Window</b><p>This opens a new instance of the eric5 IDE.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1696"/> + <location filename="../UI/UserInterface.py" line="1698"/> <source>Unittest Rerun Failed</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1696"/> + <location filename="../UI/UserInterface.py" line="1698"/> <source>Rerun Failed Tests...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1701"/> - <source>Rerun failed tests of the last run</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1703"/> + <source>Rerun failed tests of the last run</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1705"/> <source><b>Rerun Failed Tests</b><p>Rerun all tests that failed during the last unittest run.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1835"/> + <location filename="../UI/UserInterface.py" line="1837"/> <source>Compare &Files side by side...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1903"/> + <location filename="../UI/UserInterface.py" line="1905"/> <source>Snapshot</source> <translation type="unfinished">Снимок</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1903"/> + <location filename="../UI/UserInterface.py" line="1905"/> <source>&Snapshot...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1908"/> - <source>Take snapshots of a screen region</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1910"/> + <source>Take snapshots of a screen region</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1912"/> <source><b>Snapshot</b><p>This opens a dialog to take snapshots of a screen region.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4466"/> + <location filename="../UI/UserInterface.py" line="4485"/> <source><p>Could not start Snapshot tool.<br>Ensure that it is available as <b>{0}</b>.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="6074"/> + <location filename="../UI/UserInterface.py" line="6097"/> <source>Select Workspace Directory</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1396"/> + <location filename="../UI/UserInterface.py" line="1398"/> <source>Left Toolbox</source> <translation>Левая панель инструментов</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1408"/> + <location filename="../UI/UserInterface.py" line="1410"/> <source>Right Toolbox</source> <translation>Правая панель инструментов</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1262"/> - <source>Switch the input focus to the Project-Viewer window.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1264"/> + <source>Switch the input focus to the Project-Viewer window.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1266"/> <source><b>Activate Project-Viewer</b><p>This switches the input focus to the Project-Viewer window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1279"/> - <source>Switch the input focus to the Multiproject-Viewer window.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1281"/> + <source>Switch the input focus to the Multiproject-Viewer window.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1283"/> <source><b>Activate Multiproject-Viewer</b><p>This switches the input focus to the Multiproject-Viewer window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1297"/> - <source>Switch the input focus to the Debug-Viewer window.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1299"/> + <source>Switch the input focus to the Debug-Viewer window.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1301"/> <source><b>Activate Debug-Viewer</b><p>This switches the input focus to the Debug-Viewer window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1315"/> - <source>Switch the input focus to the Shell window.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1317"/> + <source>Switch the input focus to the Shell window.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1319"/> <source><b>Activate Shell</b><p>This switches the input focus to the Shell window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1325"/> + <location filename="../UI/UserInterface.py" line="1327"/> <source>&File-Browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1331"/> - <source>Switch the input focus to the File-Browser window.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1333"/> + <source>Switch the input focus to the File-Browser window.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1335"/> <source><b>Activate File-Browser</b><p>This switches the input focus to the File-Browser window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1342"/> + <location filename="../UI/UserInterface.py" line="1344"/> <source>Lo&g-Viewer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1348"/> - <source>Switch the input focus to the Log-Viewer window.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1350"/> + <source>Switch the input focus to the Log-Viewer window.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1352"/> <source><b>Activate Log-Viewer</b><p>This switches the input focus to the Log-Viewer window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1360"/> + <location filename="../UI/UserInterface.py" line="1362"/> <source>&Task-Viewer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1366"/> + <location filename="../UI/UserInterface.py" line="1368"/> <source>Switch the input focus to the Task-Viewer window.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1378"/> + <location filename="../UI/UserInterface.py" line="1380"/> <source>Templ&ate-Viewer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1384"/> - <source>Switch the input focus to the Template-Viewer window.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1386"/> + <source>Switch the input focus to the Template-Viewer window.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1388"/> <source><b>Activate Template-Viewer</b><p>This switches the input focus to the Template-Viewer window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1396"/> + <location filename="../UI/UserInterface.py" line="1398"/> <source>&Left Toolbox</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1399"/> + <location filename="../UI/UserInterface.py" line="1401"/> <source>Toggle the Left Toolbox window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1400"/> + <location filename="../UI/UserInterface.py" line="1402"/> <source><b>Toggle the Left Toolbox window</b><p>If the Left Toolbox window is hidden then display it. If it is displayed then close it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1408"/> + <location filename="../UI/UserInterface.py" line="1410"/> <source>&Right Toolbox</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1412"/> + <location filename="../UI/UserInterface.py" line="1414"/> <source>Toggle the Right Toolbox window</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1413"/> + <location filename="../UI/UserInterface.py" line="1415"/> <source><b>Toggle the Right Toolbox window</b><p>If the Right Toolbox window is hidden then display it. If it is displayed then close it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1448"/> + <location filename="../UI/UserInterface.py" line="1450"/> <source>Right Sidebar</source> <translation type="unfinished">Правая док-панель</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1448"/> + <location filename="../UI/UserInterface.py" line="1450"/> <source>&Right Sidebar</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1452"/> - <source>Toggle the right sidebar window</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1454"/> + <source>Toggle the right sidebar window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1456"/> <source><b>Toggle the right sidebar window</b><p>If the right sidebar window is hidden then display it. If it is displayed then close it.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1476"/> + <location filename="../UI/UserInterface.py" line="1478"/> <source>Cooperation-Viewer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1476"/> + <location filename="../UI/UserInterface.py" line="1478"/> <source>Co&operation-Viewer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1482"/> - <source>Switch the input focus to the Cooperation-Viewer window.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1484"/> + <source>Switch the input focus to the Cooperation-Viewer window.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1486"/> <source><b>Activate Cooperation-Viewer</b><p>This switches the input focus to the Cooperation-Viewer window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1511"/> + <location filename="../UI/UserInterface.py" line="1513"/> <source>Symbols-Viewer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1511"/> + <location filename="../UI/UserInterface.py" line="1513"/> <source>S&ymbols-Viewer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1517"/> - <source>Switch the input focus to the Symbols-Viewer window.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1519"/> + <source>Switch the input focus to the Symbols-Viewer window.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1521"/> <source><b>Activate Symbols-Viewer</b><p>This switches the input focus to the Symbols-Viewer window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1529"/> + <location filename="../UI/UserInterface.py" line="1531"/> <source>Numbers-Viewer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1529"/> + <location filename="../UI/UserInterface.py" line="1531"/> <source>Num&bers-Viewer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1535"/> - <source>Switch the input focus to the Numbers-Viewer window.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1537"/> + <source>Switch the input focus to the Numbers-Viewer window.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1539"/> <source><b>Activate Numbers-Viewer</b><p>This switches the input focus to the Numbers-Viewer window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2449"/> + <location filename="../UI/UserInterface.py" line="2451"/> <source>&Windows</source> <translation type="unfinished">&Окна</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1368"/> + <location filename="../UI/UserInterface.py" line="1370"/> <source><b>Activate Task-Viewer</b><p>This switches the input focus to the Task-Viewer window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1494"/> + <location filename="../UI/UserInterface.py" line="1496"/> <source>IRC</source> <translation type="unfinished">IRC</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1494"/> + <location filename="../UI/UserInterface.py" line="1496"/> <source>&IRC</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1494"/> + <location filename="../UI/UserInterface.py" line="1496"/> <source>Meta+Shift+I</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1500"/> - <source>Switch the input focus to the IRC window.</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="1502"/> + <source>Switch the input focus to the IRC window.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="1504"/> <source><b>Activate IRC</b><p>This switches the input focus to the IRC window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1754"/> + <location filename="../UI/UserInterface.py" line="1756"/> <source>Qt-Designer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1754"/> + <location filename="../UI/UserInterface.py" line="1756"/> <source>Qt-&Designer...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1759"/> + <location filename="../UI/UserInterface.py" line="1761"/> <source>Start Qt-Designer</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1760"/> + <location filename="../UI/UserInterface.py" line="1762"/> <source><b>Qt-Designer</b><p>Start Qt-Designer.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1780"/> + <location filename="../UI/UserInterface.py" line="1782"/> <source>Qt-Linguist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1780"/> + <location filename="../UI/UserInterface.py" line="1782"/> <source>Qt-&Linguist...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1785"/> + <location filename="../UI/UserInterface.py" line="1787"/> <source>Start Qt-Linguist</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1786"/> + <location filename="../UI/UserInterface.py" line="1788"/> <source><b>Qt-Linguist</b><p>Start Qt-Linguist.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2221"/> + <location filename="../UI/UserInterface.py" line="2223"/> <source>Qt5 Documentation</source> <translation>Документация Qt5</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2221"/> + <location filename="../UI/UserInterface.py" line="2223"/> <source>Qt&5 Documentation</source> <translation>Документация Qt&5</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2225"/> + <location filename="../UI/UserInterface.py" line="2227"/> <source>Open Qt5 Documentation</source> <translation>Открыть документацию Qt5</translation> </message> @@ -59933,67 +61475,67 @@ <p>Отобразить документацию Qt5. В зависимости от настроек, она отобразится либо во встроенном просмотрщике помощи Eric, либо вызовет интернет-браузер, либо Qt Assistant.</p></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2763"/> + <location filename="../UI/UserInterface.py" line="2765"/> <source><p>This part of the status bar allows zooming the current editor, shell or terminal.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2067"/> + <location filename="../UI/UserInterface.py" line="2069"/> <source>Manage SSL Certificates</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2067"/> + <location filename="../UI/UserInterface.py" line="2069"/> <source>Manage SSL Certificates...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2072"/> - <source>Manage the saved SSL certificates</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="2074"/> + <source>Manage the saved SSL certificates</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="2076"/> <source><b>Manage SSL Certificates...</b><p>Opens a dialog to manage the saved SSL certificates.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2083"/> + <location filename="../UI/UserInterface.py" line="2085"/> <source>Edit Message Filters</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2083"/> + <location filename="../UI/UserInterface.py" line="2085"/> <source>Edit Message Filters...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2088"/> - <source>Edit the message filters used to suppress unwanted messages</source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../UI/UserInterface.py" line="2090"/> + <source>Edit the message filters used to suppress unwanted messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../UI/UserInterface.py" line="2092"/> <source><b>Edit Message Filters</b><p>Opens a dialog to edit the message filters used to suppress unwanted messages been shown in an error window.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2235"/> + <location filename="../UI/UserInterface.py" line="2237"/> <source>PyQt&4 Documentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2251"/> + <location filename="../UI/UserInterface.py" line="2253"/> <source>PyQt5 Documentation</source> <translation type="unfinished">Документация PyQt4 {5 ?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2251"/> + <location filename="../UI/UserInterface.py" line="2253"/> <source>PyQt&5 Documentation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2255"/> + <location filename="../UI/UserInterface.py" line="2257"/> <source>Open PyQt5 Documentation</source> <translation type="unfinished">Открыть документацию Qt4 {5 ?}</translation> </message> @@ -60004,57 +61546,57 @@ <p>Отобразить документацию PyQt4. В зависимости от настроек, она отобразится либо во встроенном просмотрщике помощи Eric, либо вызовет интернет-браузер, либо Qt Assistant.</p> {5 ?} {5 ?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="4881"/> + <location filename="../UI/UserInterface.py" line="4900"/> <source><p>The PyQt5 documentation starting point has not been configured.</p></source> <translation type="unfinished"><p>Корень документации PyQt4 не найден.</p> {5 ?}</translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2212"/> + <location filename="../UI/UserInterface.py" line="2214"/> <source><b>Qt4 Documentation</b><p>Display the Qt4 Documentation. Dependent upon your settings, this will either show the help in Eric's internal help viewer, or execute a web browser or Qt Assistant. </p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2226"/> + <location filename="../UI/UserInterface.py" line="2228"/> <source><b>Qt5 Documentation</b><p>Display the Qt5 Documentation. Dependent upon your settings, this will either show the help in Eric's internal help viewer, or execute a web browser or Qt Assistant. </p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2240"/> + <location filename="../UI/UserInterface.py" line="2242"/> <source><b>PyQt4 Documentation</b><p>Display the PyQt4 Documentation. Dependent upon your settings, this will either show the help in Eric's internal help viewer, or execute a web browser or Qt Assistant. </p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2257"/> + <location filename="../UI/UserInterface.py" line="2259"/> <source><b>PyQt5 Documentation</b><p>Display the PyQt5 Documentation. Dependent upon your settings, this will either show the help in Eric's internal help viewer, or execute a web browser or Qt Assistant. </p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2280"/> + <location filename="../UI/UserInterface.py" line="2282"/> <source><b>Python 3 Documentation</b><p>Display the Python 3 documentation. If no documentation directory is configured, the location of the Python 3 documentation is assumed to be the doc directory underneath the location of the Python 3 executable on Windows and <i>/usr/share/doc/packages/python/html</i> on Unix. Set PYTHON3DOCDIR in your environment to override this.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="2343"/> + <location filename="../UI/UserInterface.py" line="2345"/> <source><b>PySide Documentation</b><p>Display the PySide Documentation. Dependent upon your settings, this will either show the help in Eric's internal help viewer, or execute a web browser or Qt Assistant. </p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="5823"/> + <location filename="../UI/UserInterface.py" line="5846"/> <source>%v/%m</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1633"/> + <location filename="../UI/UserInterface.py" line="1635"/> <source>Show Error Log</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1629"/> + <location filename="../UI/UserInterface.py" line="1631"/> <source>Show Error &Log...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../UI/UserInterface.py" line="1634"/> + <location filename="../UI/UserInterface.py" line="1636"/> <source><b>Show Error Log...</b><p>Opens a dialog showing the most recent error log.</p></source> <translation type="unfinished"></translation> </message> @@ -60062,48 +61604,48 @@ <context> <name>UserPropertiesDialog</name> <message> - <location filename="../Project/UserPropertiesDialog.ui" line="26"/> + <location filename="../Project/UserPropertiesDialog.ui" line="27"/> <source>VCS Status Monitor</source> <translation>Монитор статуса VCS</translation> </message> <message> - <location filename="../Project/UserPropertiesDialog.ui" line="32"/> + <location filename="../Project/UserPropertiesDialog.ui" line="33"/> <source>Select the interval in seconds for VCS status updates (0 to disable)</source> <translation>Задайте интервал обновления статуса VCS в секундах (0 — запретить)</translation> </message> <message> - <location filename="../Project/UserPropertiesDialog.ui" line="35"/> + <location filename="../Project/UserPropertiesDialog.ui" line="36"/> <source> sec</source> <translation> с</translation> </message> <message> - <location filename="../Project/UserPropertiesDialog.ui" line="74"/> + <location filename="../Project/UserPropertiesDialog.ui" line="75"/> <source>Select to make the interface selection the default for the project</source> <translation>Сделать выбор интерфейса значением для проекта по-умолчанию</translation> </message> <message> - <location filename="../Project/UserPropertiesDialog.ui" line="77"/> + <location filename="../Project/UserPropertiesDialog.ui" line="78"/> <source>Make interface selection the default</source> <translation>Сделать выбор умолчанием</translation> </message> <message> - <location filename="../Project/UserPropertiesDialog.ui" line="13"/> + <location filename="../Project/UserPropertiesDialog.ui" line="14"/> <source>User Project Properties</source> <translation>Пользовательские настройки проекта</translation> </message> <message> - <location filename="../Project/UserPropertiesDialog.ui" line="16"/> + <location filename="../Project/UserPropertiesDialog.ui" line="17"/> <source><b>User Project Properties</b> <p>This dialog is used to show and edit the user specific project properties.</p></source> <translation><b>Пользовательские свойства проекта...</b><p>Отображает диалог для редактирования пользовательских свойств проекта.</p></translation> </message> <message> - <location filename="../Project/UserPropertiesDialog.ui" line="61"/> + <location filename="../Project/UserPropertiesDialog.ui" line="62"/> <source>VCS Interface</source> <translation>Интерфейс VCS</translation> </message> <message> - <location filename="../Project/UserPropertiesDialog.ui" line="67"/> + <location filename="../Project/UserPropertiesDialog.ui" line="68"/> <source>Select the vcs interface to be used</source> <translation>Укажите, какой интерфейс VCS следует использовать</translation> </message> @@ -60111,7 +61653,7 @@ <context> <name>Utilities</name> <message> - <location filename="../Utilities/__init__.py" line="1177"/> + <location filename="../Utilities/__init__.py" line="1207"/> <source><p>You may use %-codes as placeholders in the string. Supported codes are:<table><tr><td>%C</td><td>column of the cursor of the current editor</td></tr><tr><td>%D</td><td>directory of the current editor</td></tr><tr><td>%F</td><td>filename of the current editor</td></tr><tr><td>%H</td><td>home directory of the current user</td></tr><tr><td>%L</td><td>line of the cursor of the current editor</td></tr><tr><td>%P</td><td>path of the current project</td></tr><tr><td>%S</td><td>selected text of the current editor</td></tr><tr><td>%U</td><td>username of the current user</td></tr><tr><td>%%</td><td>the percent sign</td></tr></table></p></source> <translation><p>В строках вы можете использовать следующие %-коды:: <table> @@ -60126,15 +61668,25 @@ <tr><td>%%</td><td>знак процента</td></tr></table></p></translation> </message> <message> - <location filename="../Utilities/__init__.py" line="1375"/> + <location filename="../Utilities/__init__.py" line="1406"/> <source>Python2 interpreter not configured.</source> <translation>Интерпретатор Python2 не настроен.</translation> </message> <message> - <location filename="../Utilities/__init__.py" line="1425"/> + <location filename="../Utilities/__init__.py" line="1482"/> <source>Python2 interpreter did not finish within 30s.</source> <translation>Интерпретатор Python2 не завершился в течение 30 секунд.</translation> </message> + <message> + <location filename="../Utilities/__init__.py" line="1417"/> + <source>Codingerror: {0}</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Utilities/__init__.py" line="1473"/> + <source>eric5 error: Invalid data received from Python2 syntax checker.</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Variable Types</name> @@ -60895,82 +62447,82 @@ <translation><b>Добавить в репозиторий</b><p>Добавляет (импортирует) локальный проект в репозиторий VCS.</p></translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="173"/> + <location filename="../VCS/ProjectHelper.py" line="175"/> <source>New Project</source> <translation>Новый проект</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="334"/> + <location filename="../VCS/ProjectHelper.py" line="339"/> <source>Select version control system for the project</source> <translation>Выберите систему контроля версий (VCS) для проекта</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="354"/> + <location filename="../VCS/ProjectHelper.py" line="360"/> <source>Would you like to edit the VCS command options?</source> <translation>Желаете ли вы редактировать опции команд VCS?</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="189"/> + <location filename="../VCS/ProjectHelper.py" line="194"/> <source>Create project directory</source> <translation>Создать каталог проекта</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="189"/> + <location filename="../VCS/ProjectHelper.py" line="194"/> <source><p>The project directory <b>{0}</b> could not be created.</p></source> <translation><p>Невозможно создать каталог проекта <b>{0}</b>.</p></translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="278"/> + <location filename="../VCS/ProjectHelper.py" line="283"/> <source>New project from repository</source> <translation>Новый проект из репозитория</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="218"/> + <location filename="../VCS/ProjectHelper.py" line="223"/> <source>Select a project file to open.</source> <translation>Выберите файл проекта, который надо открыть.</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="266"/> + <location filename="../VCS/ProjectHelper.py" line="271"/> <source>Shall the project file be added to the repository?</source> <translation>Добавить файл проекта в репозиторий?</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="278"/> + <location filename="../VCS/ProjectHelper.py" line="283"/> <source>The project could not be retrieved from the repository.</source> <translation>Невозможно извлечь проект из репозитория.</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="354"/> + <location filename="../VCS/ProjectHelper.py" line="360"/> <source>Import Project</source> <translation>Импортировать проект</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="412"/> + <location filename="../VCS/ProjectHelper.py" line="421"/> <source>Remove project from repository</source> <translation>Удалить проект из репозитория</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="412"/> + <location filename="../VCS/ProjectHelper.py" line="421"/> <source>Dou you really want to remove this project from the repository (and disk)?</source> <translation>Вы правда хотите удалить этот проект и из репозитория, и с диска?</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="386"/> + <location filename="../VCS/ProjectHelper.py" line="395"/> <source>Update</source> <translation>Обновить</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="474"/> + <location filename="../VCS/ProjectHelper.py" line="491"/> <source>The project should be reread. Do this now?</source> <translation>Необходимо перезагрузить проект. Сделать это?</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="233"/> + <location filename="../VCS/ProjectHelper.py" line="238"/> <source>The project retrieved from the repository does not contain an eric project file (*.e4p). Create it?</source> <translation>В проекте отсутствует файл описания проекта (*.e4p). Создать?</translation> </message> <message> - <location filename="../VCS/ProjectHelper.py" line="474"/> + <location filename="../VCS/ProjectHelper.py" line="491"/> <source>Switch</source> <translation>Переключиться</translation> </message> @@ -61045,17 +62597,17 @@ <context> <name>VersionControl</name> <message> - <location filename="../VCS/VersionControl.py" line="568"/> + <location filename="../VCS/VersionControl.py" line="594"/> <source>Process Generation Error</source> <translation>Ошибка процесса генерации</translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="568"/> + <location filename="../VCS/VersionControl.py" line="594"/> <source>The process {0} could not be started. Ensure, that it is in the search path.</source> <translation>Не могу запустить процесс '{0}'. Убедитесь, что он находится в пути поиска.</translation> </message> <message> - <location filename="../VCS/VersionControl.py" line="699"/> + <location filename="../VCS/VersionControl.py" line="725"/> <source>Repository status checking is switched off</source> <translation>Проверка статуса репозитория отключена</translation> </message> @@ -61063,123 +62615,123 @@ <context> <name>ViewManager</name> <message> - <location filename="../ViewManager/ViewManager.py" line="519"/> + <location filename="../ViewManager/ViewManager.py" line="563"/> <source>New</source> <translation>Новый</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="519"/> + <location filename="../ViewManager/ViewManager.py" line="563"/> <source>&New</source> <translation>&Новый</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="526"/> + <location filename="../ViewManager/ViewManager.py" line="570"/> <source>Open an empty editor window</source> <translation>Открыть пустое окно редактора</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="529"/> + <location filename="../ViewManager/ViewManager.py" line="573"/> <source><b>New</b><p>An empty editor window will be created.</p></source> <translation><b>Новый документ</b> <p>Будет создано пустое окно редактора.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="537"/> + <location filename="../ViewManager/ViewManager.py" line="581"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="537"/> + <location filename="../ViewManager/ViewManager.py" line="581"/> <source>&Open...</source> <translation>&Открыть...</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="557"/> + <location filename="../ViewManager/ViewManager.py" line="601"/> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="557"/> + <location filename="../ViewManager/ViewManager.py" line="601"/> <source>&Close</source> <translation>&Закрыть</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="564"/> + <location filename="../ViewManager/ViewManager.py" line="608"/> <source>Close the current window</source> <translation>Закрыть текущее окно</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="566"/> + <location filename="../ViewManager/ViewManager.py" line="610"/> <source><b>Close Window</b><p>Close the current window.</p></source> <translation><b>Закрыть окно</b> <p>Закрыть текущее окно.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="574"/> + <location filename="../ViewManager/ViewManager.py" line="618"/> <source>Close All</source> <translation>Закрыть всё</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="574"/> + <location filename="../ViewManager/ViewManager.py" line="618"/> <source>Clos&e All</source> <translation>Закрыть &всё</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="578"/> + <location filename="../ViewManager/ViewManager.py" line="622"/> <source>Close all editor windows</source> <translation>Закрыть все окна редакторов</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="580"/> + <location filename="../ViewManager/ViewManager.py" line="624"/> <source><b>Close All Windows</b><p>Close all editor windows.</p></source> <translation><b>Закрыть все окна</b> <p>Закрыть все окна редакторов.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="592"/> + <location filename="../ViewManager/ViewManager.py" line="636"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="592"/> + <location filename="../ViewManager/ViewManager.py" line="636"/> <source>&Save</source> <translation>&Сохранить</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="599"/> + <location filename="../ViewManager/ViewManager.py" line="643"/> <source>Save the current file</source> <translation>Сохранить текущий файл</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="601"/> + <location filename="../ViewManager/ViewManager.py" line="645"/> <source><b>Save File</b><p>Save the contents of current editor window.</p></source> <translation><b>Сохранить файл</b> <p>Сохранить содержимое текущего окна редактора.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="609"/> + <location filename="../ViewManager/ViewManager.py" line="653"/> <source>Save as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="609"/> + <location filename="../ViewManager/ViewManager.py" line="653"/> <source>Save &as...</source> <translation>Сохранить &как...</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="616"/> + <location filename="../ViewManager/ViewManager.py" line="660"/> <source>Save the current file to a new one</source> <translation>Сохранить текущий файл в новый</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="618"/> + <location filename="../ViewManager/ViewManager.py" line="662"/> <source><b>Save File as</b><p>Save the contents of current editor window to a new file. The file can be entered in a file selection dialog.</p></source> <translation><b>Сохранить как</b> <p>Сохранить содержимое текущего редактора в новый файл. Имя файла я спрошу с помощью файлового диалога.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="627"/> + <location filename="../ViewManager/ViewManager.py" line="671"/> <source>Save all</source> <translation>Сохранить всё</translation> </message> @@ -61189,149 +62741,149 @@ <translation type="obsolete">Сох&ранить всё...</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="632"/> + <location filename="../ViewManager/ViewManager.py" line="676"/> <source>Save all files</source> <translation>Сохранить все файлы</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="634"/> + <location filename="../ViewManager/ViewManager.py" line="678"/> <source><b>Save All Files</b><p>Save the contents of all editor windows.</p></source> <translation><b>Сохранить все файлы</b> <p>Сохранить содержимое всех редакторов.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="644"/> + <location filename="../ViewManager/ViewManager.py" line="688"/> <source>Print</source> <translation>Печать</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="644"/> + <location filename="../ViewManager/ViewManager.py" line="688"/> <source>&Print</source> <translation>&Печать</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="651"/> + <location filename="../ViewManager/ViewManager.py" line="695"/> <source>Print the current file</source> <translation>Распечатать текущий файл</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="653"/> + <location filename="../ViewManager/ViewManager.py" line="697"/> <source><b>Print File</b><p>Print the contents of current editor window.</p></source> <translation><b>Печать</b> <p>Распечатать содержимое текущего окна редактора.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="702"/> + <location filename="../ViewManager/ViewManager.py" line="746"/> <source>Open &Recent Files</source> <translation>Открыть &недавние файлы</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="796"/> + <location filename="../ViewManager/ViewManager.py" line="840"/> <source>Undo</source> <translation>Отмена</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="796"/> + <location filename="../ViewManager/ViewManager.py" line="840"/> <source>&Undo</source> <translation>&Отмена</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="805"/> + <location filename="../ViewManager/ViewManager.py" line="849"/> <source>Undo the last change</source> <translation>Отменить последнее изменение</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="807"/> + <location filename="../ViewManager/ViewManager.py" line="851"/> <source><b>Undo</b><p>Undo the last change done in the current editor.</p></source> <translation><b>Отмена</b> <p>Отменить последнее изменение в текущем редакторе.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="815"/> + <location filename="../ViewManager/ViewManager.py" line="859"/> <source>Redo</source> <translation>Повтор</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="815"/> + <location filename="../ViewManager/ViewManager.py" line="859"/> <source>&Redo</source> <translation>&Повтор</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="823"/> + <location filename="../ViewManager/ViewManager.py" line="867"/> <source>Redo the last change</source> <translation>Восстановить последнее отменённое изменение</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="825"/> + <location filename="../ViewManager/ViewManager.py" line="869"/> <source><b>Redo</b><p>Redo the last change done in the current editor.</p></source> <translation><b>Повтор</b> <p>Восстановить последнее отменённое изменение.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="855"/> + <location filename="../ViewManager/ViewManager.py" line="899"/> <source>Cut</source> <translation>Вырезать</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="855"/> + <location filename="../ViewManager/ViewManager.py" line="899"/> <source>Cu&t</source> <translation>В&ырезать</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="864"/> + <location filename="../ViewManager/ViewManager.py" line="908"/> <source>Cut the selection</source> <translation>Вырезать выделение</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="866"/> + <location filename="../ViewManager/ViewManager.py" line="910"/> <source><b>Cut</b><p>Cut the selected text of the current editor to the clipboard.</p></source> <translation><b>Вырезать</b> <p>Вырезать выделение и поместить его в буфер обмена.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="875"/> + <location filename="../ViewManager/ViewManager.py" line="919"/> <source>Copy</source> <translation>Копировать</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="875"/> + <location filename="../ViewManager/ViewManager.py" line="919"/> <source>&Copy</source> <translation>&Копировать</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="884"/> + <location filename="../ViewManager/ViewManager.py" line="928"/> <source>Copy the selection</source> <translation>Копировать выделение</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="886"/> + <location filename="../ViewManager/ViewManager.py" line="930"/> <source><b>Copy</b><p>Copy the selected text of the current editor to the clipboard.</p></source> <translation><b>Копировать</b> <p>Копировать выделение и поместить его в буфер обмена.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="895"/> + <location filename="../ViewManager/ViewManager.py" line="939"/> <source>Paste</source> <translation>Вставить</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="895"/> + <location filename="../ViewManager/ViewManager.py" line="939"/> <source>&Paste</source> <translation>Вс&тавить</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="904"/> + <location filename="../ViewManager/ViewManager.py" line="948"/> <source>Paste the last cut/copied text</source> <translation>Вставить вырезанный/скопированный текст</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="906"/> + <location filename="../ViewManager/ViewManager.py" line="950"/> <source><b>Paste</b><p>Paste the last cut/copied text from the clipboard to the current editor.</p></source> <translation><b>Вставить</b> <p>Вставить текст из буфера обмена в текущую позицию редактора.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="915"/> + <location filename="../ViewManager/ViewManager.py" line="959"/> <source>Clear</source> <translation>Очистить</translation> </message> @@ -61341,379 +62893,379 @@ <translation type="obsolete">О&чистить</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="923"/> + <location filename="../ViewManager/ViewManager.py" line="967"/> <source>Clear all text</source> <translation>Убрать весь текст</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="925"/> + <location filename="../ViewManager/ViewManager.py" line="969"/> <source><b>Clear</b><p>Delete all text of the current editor.</p></source> <translation><b>Очистить</b> <p>Удалить весь текст из текущего редактора.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="950"/> + <location filename="../ViewManager/ViewManager.py" line="994"/> <source>Indent</source> <translation>Увеличить отступ</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="950"/> + <location filename="../ViewManager/ViewManager.py" line="994"/> <source>&Indent</source> <translation>У&величить отступ</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="958"/> + <location filename="../ViewManager/ViewManager.py" line="1002"/> <source>Indent line</source> <translation>Увеличить отступ строки</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="960"/> + <location filename="../ViewManager/ViewManager.py" line="1004"/> <source><b>Indent</b><p>Indents the current line or the lines of the selection by one level.</p></source> <translation><b>Увеличить отступ</b> <p>Увеличить отступ текущей строки на один уровень.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="969"/> + <location filename="../ViewManager/ViewManager.py" line="1013"/> <source>Unindent</source> <translation>Уменьшить отступ</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="969"/> + <location filename="../ViewManager/ViewManager.py" line="1013"/> <source>U&nindent</source> <translation>У&меньшить отступ</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="977"/> + <location filename="../ViewManager/ViewManager.py" line="1021"/> <source>Unindent line</source> <translation>Уменьшить отступ строки</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="979"/> + <location filename="../ViewManager/ViewManager.py" line="1023"/> <source><b>Unindent</b><p>Unindents the current line or the lines of the selection by one level.</p></source> <translation><b>Уменьшить отступ</b> <p>Уменьшить отступ текущей строки на один уровень.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1007"/> + <location filename="../ViewManager/ViewManager.py" line="1051"/> <source>Comment</source> <translation>Закомментировать</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1007"/> + <location filename="../ViewManager/ViewManager.py" line="1051"/> <source>C&omment</source> <translation>&Закомментировать</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1015"/> + <location filename="../ViewManager/ViewManager.py" line="1059"/> <source>Comment Line or Selection</source> <translation>Закомментировать строку или выделение</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1017"/> + <location filename="../ViewManager/ViewManager.py" line="1061"/> <source><b>Comment</b><p>Comments the current line or the lines of the current selection.</p></source> <translation><b>Закомментировать</b><p>Закомментировать строку или выделение.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1026"/> + <location filename="../ViewManager/ViewManager.py" line="1070"/> <source>Uncomment</source> <translation>Раскомментировать</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1026"/> + <location filename="../ViewManager/ViewManager.py" line="1070"/> <source>Unco&mment</source> <translation>&Раскомментировать</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1034"/> + <location filename="../ViewManager/ViewManager.py" line="1078"/> <source>Uncomment Line or Selection</source> <translation>Раскомментировать строку или выделение</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1036"/> + <location filename="../ViewManager/ViewManager.py" line="1080"/> <source><b>Uncomment</b><p>Uncomments the current line or the lines of the current selection.</p></source> <translation><b>Раскомментировать</b><p>Раскомментировать строку или выделение.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1067"/> + <location filename="../ViewManager/ViewManager.py" line="1111"/> <source>Stream Comment</source> <translation>Поточный комментарий</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1072"/> + <location filename="../ViewManager/ViewManager.py" line="1116"/> <source>Stream Comment Line or Selection</source> <translation>Закомментировать строку или выделение</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1075"/> + <location filename="../ViewManager/ViewManager.py" line="1119"/> <source><b>Stream Comment</b><p>Stream comments the current line or the current selection.</p></source> <translation><b>Закомментировать</b><p>Закомментировать строку или выделение поточным комментарием.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1084"/> + <location filename="../ViewManager/ViewManager.py" line="1128"/> <source>Box Comment</source> <translation>Прямоугольный комментарий</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1089"/> + <location filename="../ViewManager/ViewManager.py" line="1133"/> <source>Box Comment Line or Selection</source> <translation>Закомментировать строку или выделение прямоугольным комментарием</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1091"/> - <source><b>Box Comment</b><p>Box comments the current line or the lines of the current selection.</p></source> - <translation><b>Закомментировать</b><p>Закомментировать строку или выделение прямоугольным комментарием.</p></translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="1100"/> - <source>Select to brace</source> - <translation>Выбрать до скобки</translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="1100"/> - <source>Select to &brace</source> - <translation>В&ыбрать до скобки</translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="1107"/> - <source>Select text to the matching brace</source> - <translation>Выбрать до соответствующей скобки</translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="1118"/> - <source>Select all</source> - <translation>Выбрать всё</translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="1118"/> - <source>&Select all</source> - <translation>В&ыбрать всё</translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="1125"/> - <source>Select all text</source> - <translation>Выбрать весь текст</translation> - </message> - <message> <location filename="../ViewManager/ViewManager.py" line="1135"/> + <source><b>Box Comment</b><p>Box comments the current line or the lines of the current selection.</p></source> + <translation><b>Закомментировать</b><p>Закомментировать строку или выделение прямоугольным комментарием.</p></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="1144"/> + <source>Select to brace</source> + <translation>Выбрать до скобки</translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="1144"/> + <source>Select to &brace</source> + <translation>В&ыбрать до скобки</translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="1151"/> + <source>Select text to the matching brace</source> + <translation>Выбрать до соответствующей скобки</translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="1162"/> + <source>Select all</source> + <translation>Выбрать всё</translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="1162"/> + <source>&Select all</source> + <translation>В&ыбрать всё</translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="1169"/> + <source>Select all text</source> + <translation>Выбрать весь текст</translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="1179"/> <source>Deselect all</source> <translation>Снять выделение</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1135"/> + <location filename="../ViewManager/ViewManager.py" line="1179"/> <source>&Deselect all</source> <translation>&Снять выделение</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1142"/> + <location filename="../ViewManager/ViewManager.py" line="1186"/> <source>Deselect all text</source> <translation>Снять выделение со всего текста</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1159"/> + <location filename="../ViewManager/ViewManager.py" line="1203"/> <source>Convert Line End Characters</source> <translation>Сконвертировать окончания строк</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1152"/> + <location filename="../ViewManager/ViewManager.py" line="1196"/> <source>Convert &Line End Characters</source> <translation>С&конвертировать окончания строк</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1161"/> + <location filename="../ViewManager/ViewManager.py" line="1205"/> <source><b>Convert Line End Characters</b><p>Convert the line end characters to the currently set type.</p></source> <translation><b>Сконвертировать окончания строк</b> <p>Сконвертировать окончания строк к выбранному способу</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1861"/> + <location filename="../QScintilla/MiniEditor.py" line="1860"/> <source>Search</source> <translation>Поиск</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1861"/> + <location filename="../QScintilla/MiniEditor.py" line="1860"/> <source>&Search...</source> <translation>&Поиск...</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1869"/> + <location filename="../QScintilla/MiniEditor.py" line="1868"/> <source>Search for a text</source> <translation>Искать текст</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1871"/> + <location filename="../QScintilla/MiniEditor.py" line="1870"/> <source><b>Search</b><p>Search for some text in the current editor. A dialog is shown to enter the searchtext and options for the search.</p></source> <translation><b>Поиск</b> <p>Искать текст на текущей странице. Будет показан диалог поиска и опциями.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1941"/> + <location filename="../QScintilla/MiniEditor.py" line="1940"/> <source>Replace</source> <translation>Заменить</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1941"/> + <location filename="../QScintilla/MiniEditor.py" line="1940"/> <source>&Replace...</source> <translation>&Заменить...</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1948"/> + <location filename="../QScintilla/MiniEditor.py" line="1947"/> <source>Replace some text</source> <translation>Заменить текст</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1950"/> + <location filename="../QScintilla/MiniEditor.py" line="1949"/> <source><b>Replace</b><p>Search for some text in the current editor and replace it. A dialog is shown to enter the searchtext, the replacement text and options for the search and replace.</p></source> <translation><b>Заменить</b> <p>Искать в текущем редакторе текст и заменить его. Будет показан диалог с такстом для поиска, заменой и опциями</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2904"/> + <location filename="../ViewManager/ViewManager.py" line="2948"/> <source>Goto Line</source> <translation>Перейти на строку</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2896"/> + <location filename="../ViewManager/ViewManager.py" line="2940"/> <source>&Goto Line...</source> <translation>&Перейти на строку...</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2906"/> + <location filename="../ViewManager/ViewManager.py" line="2950"/> <source><b>Goto Line</b><p>Go to a specific line of text in the current editor. A dialog is shown to enter the linenumber.</p></source> <translation><b>Перейти на строку</b> <p>Перейти на указанную строку в текущем редакторе. Будет показан диалог для ввода строки.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2923"/> + <location filename="../ViewManager/ViewManager.py" line="2967"/> <source>Goto Brace</source> <translation>Перейти к скобке</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2915"/> + <location filename="../ViewManager/ViewManager.py" line="2959"/> <source>Goto &Brace</source> <translation>Перейти к &скобке</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2925"/> + <location filename="../ViewManager/ViewManager.py" line="2969"/> <source><b>Goto Brace</b><p>Go to the matching brace in the current editor.</p></source> <translation><b>Перейти к скобке</b> <p>Перейти к соответствующей скобке.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2998"/> + <location filename="../ViewManager/ViewManager.py" line="3042"/> <source>Search in Files</source> <translation>Поиск в файлах</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2998"/> + <location filename="../ViewManager/ViewManager.py" line="3042"/> <source>Search in &Files...</source> <translation>Поиск в &файлах...</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3006"/> + <location filename="../ViewManager/ViewManager.py" line="3050"/> <source>Search for a text in files</source> <translation>Искать текст в файлах</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3008"/> + <location filename="../ViewManager/ViewManager.py" line="3052"/> <source><b>Search in Files</b><p>Search for some text in the files of a directory tree or the project. A dialog is shown to enter the searchtext and options for the search and to display the result.</p></source> <translation><b>Поиск в файлах</b> <p>Искать текст в файлах каталога проекта. Будет показан диалог для ввода строки поиска и опций и отображения результатов.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3192"/> + <location filename="../ViewManager/ViewManager.py" line="3236"/> <source>Zoom in</source> <translation>Увеличить масштаб</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3192"/> + <location filename="../ViewManager/ViewManager.py" line="3236"/> <source>Zoom &in</source> <translation>У&величить масштаб</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3201"/> + <location filename="../ViewManager/ViewManager.py" line="3245"/> <source>Zoom in on the text</source> <translation>Увеличить масштаб текста</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3203"/> + <location filename="../ViewManager/ViewManager.py" line="3247"/> <source><b>Zoom in</b><p>Zoom in on the text. This makes the text bigger.</p></source> <translation><b>Увеличить масштаб</b><p>Увеличить масштаб. Размер букв увеличится.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3211"/> + <location filename="../ViewManager/ViewManager.py" line="3255"/> <source>Zoom out</source> <translation>Уменьшить масштаб</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3211"/> + <location filename="../ViewManager/ViewManager.py" line="3255"/> <source>Zoom &out</source> <translation>У&меньшить масштаб</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3220"/> + <location filename="../ViewManager/ViewManager.py" line="3264"/> <source>Zoom out on the text</source> <translation>Уменьшить масштаб текста</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3222"/> + <location filename="../ViewManager/ViewManager.py" line="3266"/> <source><b>Zoom out</b><p>Zoom out on the text. This makes the text smaller.</p></source> <translation><b>Уменьшить масштаб</b><p>Уменьшить масштаб. Размер букв уменьшится.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3249"/> + <location filename="../ViewManager/ViewManager.py" line="3293"/> <source>Zoom</source> <translation>Масштаб</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3249"/> + <location filename="../ViewManager/ViewManager.py" line="3293"/> <source>&Zoom</source> <translation>Мас&штаб</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3257"/> + <location filename="../ViewManager/ViewManager.py" line="3301"/> <source>Zoom the text</source> <translation>Масштаб текста</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3259"/> + <location filename="../ViewManager/ViewManager.py" line="3303"/> <source><b>Zoom</b><p>Zoom the text. This opens a dialog where the desired size can be entered.</p></source> <translation><b>Масштаб</b> <p>Масштаб текста. Открыть диалог для выбора желаемого масштаба текста.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3272"/> + <location filename="../ViewManager/ViewManager.py" line="3316"/> <source>Toggle all folds</source> <translation>Свернуть/развернуть все ветви</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3268"/> + <location filename="../ViewManager/ViewManager.py" line="3312"/> <source>Toggle &all folds</source> <translation>&Свернуть/развернуть все ветви</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3274"/> + <location filename="../ViewManager/ViewManager.py" line="3318"/> <source><b>Toggle all folds</b><p>Toggle all folds of the current editor.</p></source> <translation><b>Ветви</b> <p>Изменить скрытые ветви на развёрнутые и наоборот.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3304"/> + <location filename="../ViewManager/ViewManager.py" line="3348"/> <source>Toggle current fold</source> <translation>Свернуть/развернуть текущую ветвь</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3300"/> + <location filename="../ViewManager/ViewManager.py" line="3344"/> <source>Toggle &current fold</source> <translation>Свернуть/развернуть &текущую ветвь</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3306"/> + <location filename="../ViewManager/ViewManager.py" line="3350"/> <source><b>Toggle current fold</b><p>Toggle the folds of the current line of the current editor.</p></source> <translation><b>Свернуть/развернуть текущую ветвь</b> <p>Свернуть/развернуть текущую ветвь текущего редактора.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4155"/> + <location filename="../ViewManager/ViewManager.py" line="4200"/> <source>File Modified</source> <translation>Файл изменён</translation> </message> @@ -61723,98 +63275,98 @@ <translation type="obsolete">Файл: {0}</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="842"/> + <location filename="../ViewManager/ViewManager.py" line="886"/> <source>Revert to last saved state</source> <translation>Вернуть к последнему записанному состоянию</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="833"/> + <location filename="../ViewManager/ViewManager.py" line="877"/> <source>Re&vert to last saved state</source> <translation>&Вернуть к последнему записанному состоянию</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="844"/> + <location filename="../ViewManager/ViewManager.py" line="888"/> <source><b>Revert to last saved state</b><p>Undo all changes up to the last saved state of the current editor.</p></source> <translation><b>Вернуть к последнему записанному состоянию</b> <p>Отменить все изменения текущего редактора, сделанные с момента последнего сохранения.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="582"/> + <location filename="../QScintilla/MiniEditor.py" line="581"/> <source>Move left one character</source> <translation>Сдвинуться влево на один символ</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="582"/> + <location filename="../QScintilla/MiniEditor.py" line="581"/> <source>Left</source> <translation>Left</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="594"/> + <location filename="../QScintilla/MiniEditor.py" line="593"/> <source>Move right one character</source> <translation>Сдвинуться вправо на один символ</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="594"/> + <location filename="../QScintilla/MiniEditor.py" line="593"/> <source>Right</source> <translation>Right</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="606"/> + <location filename="../QScintilla/MiniEditor.py" line="605"/> <source>Move up one line</source> <translation>Сдвинуться на одну строку вверх</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="606"/> + <location filename="../QScintilla/MiniEditor.py" line="605"/> <source>Up</source> <translation>Up</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="618"/> + <location filename="../QScintilla/MiniEditor.py" line="617"/> <source>Move down one line</source> <translation>Сдвинуться на одну строку вниз</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="618"/> + <location filename="../QScintilla/MiniEditor.py" line="617"/> <source>Down</source> <translation>Вниз</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="630"/> + <location filename="../QScintilla/MiniEditor.py" line="629"/> <source>Move left one word part</source> <translation>Сдвинуться влево на одну часть слова</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="660"/> + <location filename="../QScintilla/MiniEditor.py" line="659"/> <source>Alt+Left</source> <translation>Alt+Left</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="642"/> + <location filename="../QScintilla/MiniEditor.py" line="641"/> <source>Move right one word part</source> <translation>Сдвинуться вправо на одну часть слова</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1536"/> + <location filename="../QScintilla/MiniEditor.py" line="1535"/> <source>Alt+Right</source> <translation>Alt+Right</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="654"/> + <location filename="../QScintilla/MiniEditor.py" line="653"/> <source>Move left one word</source> <translation>Сдвинуться влево на одо слово</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="710"/> + <location filename="../QScintilla/MiniEditor.py" line="709"/> <source>Ctrl+Left</source> <translation>Ctrl+Left</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="669"/> + <location filename="../QScintilla/MiniEditor.py" line="668"/> <source>Move right one word</source> <translation>Сдвинуться вправо на одно слово</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1289"/> + <location filename="../QScintilla/MiniEditor.py" line="1288"/> <source>Ctrl+Right</source> <translation>Ctrl+Right</translation> </message> @@ -61824,12 +63376,12 @@ <translation type="obsolete">Сдвинуться на первый видимый символ в строке</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1491"/> + <location filename="../QScintilla/MiniEditor.py" line="1490"/> <source>Home</source> <translation>Home</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="713"/> + <location filename="../QScintilla/MiniEditor.py" line="712"/> <source>Alt+Home</source> <translation>Alt+Home</translation> </message> @@ -61839,67 +63391,67 @@ <translation type="obsolete">Сдвинуться в конец строки</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1506"/> + <location filename="../QScintilla/MiniEditor.py" line="1505"/> <source>End</source> <translation>Конец</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="738"/> + <location filename="../QScintilla/MiniEditor.py" line="737"/> <source>Scroll view down one line</source> <translation>Промотать на одну строку вниз</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="816"/> + <location filename="../QScintilla/MiniEditor.py" line="815"/> <source>Ctrl+Down</source> <translation>Ctrl+Down</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="747"/> + <location filename="../QScintilla/MiniEditor.py" line="746"/> <source>Scroll view up one line</source> <translation>Промотать на одну строку вверх</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="801"/> + <location filename="../QScintilla/MiniEditor.py" line="800"/> <source>Ctrl+Up</source> <translation>Ctrl+Up</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="756"/> + <location filename="../QScintilla/MiniEditor.py" line="755"/> <source>Move up one paragraph</source> <translation>Сдвинуться на один параграф вверх</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="756"/> + <location filename="../QScintilla/MiniEditor.py" line="755"/> <source>Alt+Up</source> <translation>Alt+Up</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="765"/> + <location filename="../QScintilla/MiniEditor.py" line="764"/> <source>Move down one paragraph</source> <translation>Сдвинуться на один параграф вниз</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="765"/> + <location filename="../QScintilla/MiniEditor.py" line="764"/> <source>Alt+Down</source> <translation>Alt+Down</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="774"/> + <location filename="../QScintilla/MiniEditor.py" line="773"/> <source>Move up one page</source> <translation>Сдвинуться на одну страницу вверх</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="774"/> + <location filename="../QScintilla/MiniEditor.py" line="773"/> <source>PgUp</source> <translation>PgUp</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="783"/> + <location filename="../QScintilla/MiniEditor.py" line="782"/> <source>Move down one page</source> <translation>Сдвинуться на одну страницу вниз</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="783"/> + <location filename="../QScintilla/MiniEditor.py" line="782"/> <source>PgDown</source> <translation>PgDown</translation> </message> @@ -61909,7 +63461,7 @@ <translation type="obsolete">Сдвинуться в начало текста</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="804"/> + <location filename="../QScintilla/MiniEditor.py" line="803"/> <source>Ctrl+Home</source> <translation>Ctrl+Home</translation> </message> @@ -61919,107 +63471,107 @@ <translation type="obsolete">Сдвинуться в конец текста</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="819"/> + <location filename="../QScintilla/MiniEditor.py" line="818"/> <source>Ctrl+End</source> <translation>Ctrl+End</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="825"/> + <location filename="../QScintilla/MiniEditor.py" line="824"/> <source>Indent one level</source> <translation>Увеличить отступ</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="825"/> + <location filename="../QScintilla/MiniEditor.py" line="824"/> <source>Tab</source> <translation>Tab</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="834"/> + <location filename="../QScintilla/MiniEditor.py" line="833"/> <source>Unindent one level</source> <translation>Уменьшить отступ</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="834"/> + <location filename="../QScintilla/MiniEditor.py" line="833"/> <source>Shift+Tab</source> <translation>Shift+Tab</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="843"/> + <location filename="../QScintilla/MiniEditor.py" line="842"/> <source>Extend selection left one character</source> <translation>Раздвинуть выделение на один символ влево</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="843"/> + <location filename="../QScintilla/MiniEditor.py" line="842"/> <source>Shift+Left</source> <translation>Shift+Left</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="858"/> + <location filename="../QScintilla/MiniEditor.py" line="857"/> <source>Extend selection right one character</source> <translation>Раздвинуть выделение на один символ вправо</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="858"/> + <location filename="../QScintilla/MiniEditor.py" line="857"/> <source>Shift+Right</source> <translation>Shift+Right</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="874"/> + <location filename="../QScintilla/MiniEditor.py" line="873"/> <source>Extend selection up one line</source> <translation>Раздвинуть выделение на одну строку вверх</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="874"/> + <location filename="../QScintilla/MiniEditor.py" line="873"/> <source>Shift+Up</source> <translation>Shift+Up</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="890"/> + <location filename="../QScintilla/MiniEditor.py" line="889"/> <source>Extend selection down one line</source> <translation>Раздвинуть выделение на одну строку вниз</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="890"/> + <location filename="../QScintilla/MiniEditor.py" line="889"/> <source>Shift+Down</source> <translation>Shift+Down</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="906"/> + <location filename="../QScintilla/MiniEditor.py" line="905"/> <source>Extend selection left one word part</source> <translation>Раздвинуть выделение на одну часть слова влево</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="946"/> + <location filename="../QScintilla/MiniEditor.py" line="945"/> <source>Alt+Shift+Left</source> <translation>Alt+Shift+Left</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="922"/> + <location filename="../QScintilla/MiniEditor.py" line="921"/> <source>Extend selection right one word part</source> <translation>Раздвинуть выделение на одну часть слова вправо</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1551"/> + <location filename="../QScintilla/MiniEditor.py" line="1550"/> <source>Alt+Shift+Right</source> <translation>Alt+Shift+Right</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="938"/> + <location filename="../QScintilla/MiniEditor.py" line="937"/> <source>Extend selection left one word</source> <translation>Раздвинуть выделение на одно слово влево</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1643"/> + <location filename="../QScintilla/MiniEditor.py" line="1642"/> <source>Ctrl+Shift+Left</source> <translation>Ctrl+Shift+Left</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="955"/> + <location filename="../QScintilla/MiniEditor.py" line="954"/> <source>Extend selection right one word</source> <translation>Раздвинуть выделение на одно слово вправо</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1308"/> + <location filename="../QScintilla/MiniEditor.py" line="1307"/> <source>Ctrl+Shift+Right</source> <translation>Ctrl+Shift+Right</translation> </message> @@ -62029,7 +63581,7 @@ <translation type="obsolete">Раздвинуть выделение до первого видимого символа в строке</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="984"/> + <location filename="../QScintilla/MiniEditor.py" line="983"/> <source>Shift+Home</source> <translation>Shift+Home</translation> </message> @@ -62039,7 +63591,7 @@ <translation type="obsolete">Раздвинуть выделение до начала строки</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1412"/> + <location filename="../QScintilla/MiniEditor.py" line="1411"/> <source>Alt+Shift+Home</source> <translation>Alt+Shift+Home</translation> </message> @@ -62049,47 +63601,47 @@ <translation type="obsolete">Раздвинуть выделение до конца строки</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1001"/> + <location filename="../QScintilla/MiniEditor.py" line="1000"/> <source>Shift+End</source> <translation>Shift+End</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1007"/> + <location filename="../QScintilla/MiniEditor.py" line="1006"/> <source>Extend selection up one paragraph</source> <translation>Раздвинуть выделение на один параграф вверх</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1007"/> + <location filename="../QScintilla/MiniEditor.py" line="1006"/> <source>Alt+Shift+Up</source> <translation>Alt+Shift+Up</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1021"/> + <location filename="../QScintilla/MiniEditor.py" line="1020"/> <source>Extend selection down one paragraph</source> <translation>Раздвинуть выделение на один параграф вниз</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1021"/> + <location filename="../QScintilla/MiniEditor.py" line="1020"/> <source>Alt+Shift+Down</source> <translation>Alt+Shift+Down</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1034"/> + <location filename="../QScintilla/MiniEditor.py" line="1033"/> <source>Extend selection up one page</source> <translation>Раздвинуть выделение на страницу вверх</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1034"/> + <location filename="../QScintilla/MiniEditor.py" line="1033"/> <source>Shift+PgUp</source> <translation>Shift+PgUp</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1047"/> + <location filename="../QScintilla/MiniEditor.py" line="1046"/> <source>Extend selection down one page</source> <translation>Раздвинуть выделение на страницу вниз</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1047"/> + <location filename="../QScintilla/MiniEditor.py" line="1046"/> <source>Shift+PgDown</source> <translation>Shift+PgDown</translation> </message> @@ -62099,7 +63651,7 @@ <translation type="obsolete">Раздвинуть выделение до начала текста</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1075"/> + <location filename="../QScintilla/MiniEditor.py" line="1074"/> <source>Ctrl+Shift+Home</source> <translation>Ctrl+Shift+Home</translation> </message> @@ -62109,17 +63661,17 @@ <translation type="obsolete">Раздвинуть выделение до конца текста</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1092"/> + <location filename="../QScintilla/MiniEditor.py" line="1091"/> <source>Ctrl+Shift+End</source> <translation>Ctrl+Shift+End</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1098"/> + <location filename="../QScintilla/MiniEditor.py" line="1097"/> <source>Delete previous character</source> <translation>Удалить предыдущий символ</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1098"/> + <location filename="../QScintilla/MiniEditor.py" line="1097"/> <source>Backspace</source> <translation>Backspace</translation> </message> @@ -62129,415 +63681,415 @@ <translation type="obsolete">Удалить предыдущий символ не переходя на другую строку</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1128"/> + <location filename="../QScintilla/MiniEditor.py" line="1127"/> <source>Delete current character</source> <translation>Удалить текущий символ</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1128"/> + <location filename="../QScintilla/MiniEditor.py" line="1127"/> <source>Del</source> <translation>Del</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1140"/> + <location filename="../QScintilla/MiniEditor.py" line="1139"/> <source>Delete word to left</source> <translation>Удалить слово слева</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1140"/> + <location filename="../QScintilla/MiniEditor.py" line="1139"/> <source>Ctrl+Backspace</source> <translation>Ctrl+Backspace</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1150"/> + <location filename="../QScintilla/MiniEditor.py" line="1149"/> <source>Delete word to right</source> <translation>Удалить слово справа</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1150"/> + <location filename="../QScintilla/MiniEditor.py" line="1149"/> <source>Ctrl+Del</source> <translation>Ctrl+Del</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1159"/> + <location filename="../QScintilla/MiniEditor.py" line="1158"/> <source>Delete line to left</source> <translation>Удалить строку слева</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1159"/> + <location filename="../QScintilla/MiniEditor.py" line="1158"/> <source>Ctrl+Shift+Backspace</source> <translation>Ctrl+Shift+Backspace</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1169"/> + <location filename="../QScintilla/MiniEditor.py" line="1168"/> <source>Delete line to right</source> <translation>Удалить строку справа</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1178"/> + <location filename="../QScintilla/MiniEditor.py" line="1177"/> <source>Ctrl+Shift+Del</source> <translation>Ctrl+Shift+Del</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1184"/> + <location filename="../QScintilla/MiniEditor.py" line="1183"/> <source>Insert new line</source> <translation>Вставить новую строку</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1184"/> + <location filename="../QScintilla/MiniEditor.py" line="1183"/> <source>Return</source> <translation>Return</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1194"/> + <location filename="../QScintilla/MiniEditor.py" line="1193"/> <source>Delete current line</source> <translation>Удалить текущую строку</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1194"/> + <location filename="../QScintilla/MiniEditor.py" line="1193"/> <source>Ctrl+Shift+L</source> <translation>Ctrl+Shift+L</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1204"/> + <location filename="../QScintilla/MiniEditor.py" line="1203"/> <source>Duplicate current line</source> <translation>Сдублировать текущую строку</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1204"/> + <location filename="../QScintilla/MiniEditor.py" line="1203"/> <source>Ctrl+D</source> <translation>Ctrl+D</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1213"/> + <location filename="../QScintilla/MiniEditor.py" line="1212"/> <source>Swap current and previous lines</source> <translation>Поменять местами предыдущую и последующую строки</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1213"/> + <location filename="../QScintilla/MiniEditor.py" line="1212"/> <source>Ctrl+T</source> <translation>Ctrl+T</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1226"/> + <location filename="../QScintilla/MiniEditor.py" line="1225"/> <source>Cut current line</source> <translation>Вырезать текущую строку</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1226"/> + <location filename="../QScintilla/MiniEditor.py" line="1225"/> <source>Alt+Shift+L</source> <translation>Alt+Shift+L</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1235"/> + <location filename="../QScintilla/MiniEditor.py" line="1234"/> <source>Copy current line</source> <translation>Скопировать текущую строку</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1235"/> + <location filename="../QScintilla/MiniEditor.py" line="1234"/> <source>Ctrl+Shift+T</source> <translation>Ctrl+Shift+T</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1245"/> + <location filename="../QScintilla/MiniEditor.py" line="1244"/> <source>Toggle insert/overtype</source> <translation>Вставка/замена</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1245"/> + <location filename="../QScintilla/MiniEditor.py" line="1244"/> <source>Ins</source> <translation>Ins</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1254"/> + <location filename="../QScintilla/MiniEditor.py" line="1253"/> <source>Convert selection to lower case</source> <translation>Преобразовать выделение в нижний регистр</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1254"/> + <location filename="../QScintilla/MiniEditor.py" line="1253"/> <source>Alt+Shift+U</source> <translation>Alt+Shift+U</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1267"/> + <location filename="../QScintilla/MiniEditor.py" line="1266"/> <source>Convert selection to upper case</source> <translation>Преобразовать выделение в верхний регистр</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1267"/> + <location filename="../QScintilla/MiniEditor.py" line="1266"/> <source>Ctrl+Shift+U</source> <translation>Ctrl+Shift+U</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3369"/> + <location filename="../ViewManager/ViewManager.py" line="3413"/> <source>Split view</source> <translation>Разделить вид</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3369"/> + <location filename="../ViewManager/ViewManager.py" line="3413"/> <source>&Split view</source> <translation>&Разделить вид</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3374"/> + <location filename="../ViewManager/ViewManager.py" line="3418"/> <source>Add a split to the view</source> <translation>Добавить разделитель к виду</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3376"/> + <location filename="../ViewManager/ViewManager.py" line="3420"/> <source><b>Split view</b><p>Add a split to the view.</p></source> <translation><b>Разделить вид</b><p>Добавить разделитель к виду.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3384"/> + <location filename="../ViewManager/ViewManager.py" line="3428"/> <source>Arrange horizontally</source> <translation>Расположить горизонтально</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3384"/> + <location filename="../ViewManager/ViewManager.py" line="3428"/> <source>Arrange &horizontally</source> <translation>Расположить &горизонтально</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3388"/> + <location filename="../ViewManager/ViewManager.py" line="3432"/> <source>Arrange the splitted views horizontally</source> <translation>Расположить разделённые виды горизонтально</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3390"/> + <location filename="../ViewManager/ViewManager.py" line="3434"/> <source><b>Arrange horizontally</b><p>Arrange the splitted views horizontally.</p></source> <translation><b>Расположить горизонтально</b> <p>Расположить разделённые виды горизонтально.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3399"/> + <location filename="../ViewManager/ViewManager.py" line="3443"/> <source>Remove split</source> <translation>Удалить разделитель</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3399"/> + <location filename="../ViewManager/ViewManager.py" line="3443"/> <source>&Remove split</source> <translation>&Удалить разделитель</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3404"/> + <location filename="../ViewManager/ViewManager.py" line="3448"/> <source>Remove the current split</source> <translation>Удалить текущий разделитель</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3406"/> + <location filename="../ViewManager/ViewManager.py" line="3450"/> <source><b>Remove split</b><p>Remove the current split.</p></source> <translation><b>Удалить разделитель</b><p>Удалить текущий разделитель.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3545"/> + <location filename="../ViewManager/ViewManager.py" line="3589"/> <source>Start Macro Recording</source> <translation>Начать запись макроса</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3541"/> + <location filename="../ViewManager/ViewManager.py" line="3585"/> <source>S&tart Macro Recording</source> <translation>&Начать запись макроса</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3547"/> + <location filename="../ViewManager/ViewManager.py" line="3591"/> <source><b>Start Macro Recording</b><p>Start recording editor commands into a new macro.</p></source> <translation><b>Начать запись макроса</b> <p>Начать запись комнд редактора в новый макрос.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3559"/> + <location filename="../ViewManager/ViewManager.py" line="3603"/> <source>Stop Macro Recording</source> <translation>Закончить запись макроса</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3555"/> + <location filename="../ViewManager/ViewManager.py" line="3599"/> <source>Sto&p Macro Recording</source> <translation>&Закончить запись макроса</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3561"/> + <location filename="../ViewManager/ViewManager.py" line="3605"/> <source><b>Stop Macro Recording</b><p>Stop recording editor commands into a new macro.</p></source> <translation><b>Закончить запись макроса</b> <p>Закончить запись комнд редактора в новый макрос.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3573"/> - <source>Run Macro</source> - <translation>Выполнить макрос</translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="3569"/> - <source>&Run Macro</source> - <translation>&Выполнить макрос</translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="3575"/> - <source><b>Run Macro</b><p>Run a previously recorded editor macro.</p></source> - <translation><b>Выполнить макрос</b> -<p>Запустить записанный макрос.</p></translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="3587"/> - <source>Delete Macro</source> - <translation>Удалить макрос</translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="3583"/> - <source>&Delete Macro</source> - <translation>&Удалить макрос</translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="3589"/> - <source><b>Delete Macro</b><p>Delete a previously recorded editor macro.</p></source> - <translation><b>Удалить макрос</b><p>Удалить записанный макрос.</p></translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="3601"/> - <source>Load Macro</source> - <translation>Загрузить макрос</translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="3597"/> - <source>&Load Macro</source> - <translation>&Загрузить макрос</translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="3603"/> - <source><b>Load Macro</b><p>Load an editor macro from a file.</p></source> - <translation><b>Загрузить макрос</b> -<p>Загрузить из файла макрос для редактора.</p></translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="3615"/> - <source>Save Macro</source> - <translation>Сохранить макрос</translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="3611"/> - <source>&Save Macro</source> - <translation>&Сохранить макрос</translation> - </message> - <message> <location filename="../ViewManager/ViewManager.py" line="3617"/> + <source>Run Macro</source> + <translation>Выполнить макрос</translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="3613"/> + <source>&Run Macro</source> + <translation>&Выполнить макрос</translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="3619"/> + <source><b>Run Macro</b><p>Run a previously recorded editor macro.</p></source> + <translation><b>Выполнить макрос</b> +<p>Запустить записанный макрос.</p></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="3631"/> + <source>Delete Macro</source> + <translation>Удалить макрос</translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="3627"/> + <source>&Delete Macro</source> + <translation>&Удалить макрос</translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="3633"/> + <source><b>Delete Macro</b><p>Delete a previously recorded editor macro.</p></source> + <translation><b>Удалить макрос</b><p>Удалить записанный макрос.</p></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="3645"/> + <source>Load Macro</source> + <translation>Загрузить макрос</translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="3641"/> + <source>&Load Macro</source> + <translation>&Загрузить макрос</translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="3647"/> + <source><b>Load Macro</b><p>Load an editor macro from a file.</p></source> + <translation><b>Загрузить макрос</b> +<p>Загрузить из файла макрос для редактора.</p></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="3659"/> + <source>Save Macro</source> + <translation>Сохранить макрос</translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="3655"/> + <source>&Save Macro</source> + <translation>&Сохранить макрос</translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="3661"/> <source><b>Save Macro</b><p>Save a previously recorded editor macro to a file.</p></source> <translation><b>Сохранить макрос</b><p>Сохранить записанный макрос в файл.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3658"/> + <location filename="../ViewManager/ViewManager.py" line="3702"/> <source>Toggle Bookmark</source> <translation>Поставить/убрать закладку</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3650"/> + <location filename="../ViewManager/ViewManager.py" line="3694"/> <source>&Toggle Bookmark</source> <translation>&Поставить/убрать закладку</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3660"/> + <location filename="../ViewManager/ViewManager.py" line="3704"/> <source><b>Toggle Bookmark</b><p>Toggle a bookmark at the current line of the current editor.</p></source> <translation><b>Поставить/убрать закладку</b> <p>Поставить/убрать закладку на текущей строчке текущего редактора.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3677"/> + <location filename="../ViewManager/ViewManager.py" line="3721"/> <source>Next Bookmark</source> <translation>Следующая закладка</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3669"/> + <location filename="../ViewManager/ViewManager.py" line="3713"/> <source>&Next Bookmark</source> <translation>&Следующая закладка</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3679"/> + <location filename="../ViewManager/ViewManager.py" line="3723"/> <source><b>Next Bookmark</b><p>Go to next bookmark of the current editor.</p></source> <translation><b>Следующая закладка</b> <p>Перейти к следующей закладке в текущем редакторе.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3695"/> + <location filename="../ViewManager/ViewManager.py" line="3739"/> <source>Previous Bookmark</source> <translation>Предыдущая закладка</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3687"/> + <location filename="../ViewManager/ViewManager.py" line="3731"/> <source>&Previous Bookmark</source> <translation>&Предыдущая закладка</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3697"/> + <location filename="../ViewManager/ViewManager.py" line="3741"/> <source><b>Previous Bookmark</b><p>Go to previous bookmark of the current editor.</p></source> <translation><b>Предыдущая закладка</b> <p>Перейти к предыдущей закладке в текущем редакторе.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3712"/> + <location filename="../ViewManager/ViewManager.py" line="3756"/> <source>Clear Bookmarks</source> <translation>Стереть закладки</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3705"/> + <location filename="../ViewManager/ViewManager.py" line="3749"/> <source>&Clear Bookmarks</source> <translation>&Стереть закладки</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3714"/> + <location filename="../ViewManager/ViewManager.py" line="3758"/> <source><b>Clear Bookmarks</b><p>Clear bookmarks of all editors.</p></source> <translation><b>Стереть закладки</b><p>Убрать закладки из всех редакторов.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3919"/> + <location filename="../ViewManager/ViewManager.py" line="3963"/> <source>&Bookmarks</source> <translation>&Закладки</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3321"/> + <location filename="../ViewManager/ViewManager.py" line="3365"/> <source>Remove all highlights</source> <translation>Снять все выделения</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3323"/> + <location filename="../ViewManager/ViewManager.py" line="3367"/> <source><b>Remove all highlights</b><p>Remove the highlights of all editors.</p></source> <translation><b>Снять все выделения</b><p>Снять выделения во всех редакторах.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1186"/> + <location filename="../ViewManager/ViewManager.py" line="1230"/> <source>Autocomplete</source> <translation>Автозавершение</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2571"/> + <location filename="../ViewManager/ViewManager.py" line="2615"/> <source>&Autocomplete</source> <translation>&Автозавершение</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1193"/> + <location filename="../ViewManager/ViewManager.py" line="1237"/> <source>Autocomplete current word</source> <translation>Автозавершение текущего слова</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1195"/> + <location filename="../ViewManager/ViewManager.py" line="1239"/> <source><b>Autocomplete</b><p>Performs an autocompletion of the word containing the cursor.</p></source> <translation><b>Автозавершение</b><p>Автоматически завершает слово, на котором находится слово.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="705"/> + <location filename="../ViewManager/ViewManager.py" line="749"/> <source>Open &Bookmarked Files</source> <translation>Открыть &закладки на файлы</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4862"/> + <location filename="../ViewManager/ViewManager.py" line="4915"/> <source>&Clear</source> <translation>&Очистить</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4856"/> + <location filename="../ViewManager/ViewManager.py" line="4909"/> <source>&Add</source> <translation>&Добавить</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4859"/> + <location filename="../ViewManager/ViewManager.py" line="4912"/> <source>&Edit...</source> <translation>&Правка...</translation> </message> @@ -62547,42 +64099,42 @@ <translation type="obsolete">Переместиться на начало отображаемой строки</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1332"/> + <location filename="../QScintilla/MiniEditor.py" line="1331"/> <source>Extend rectangular selection down one line</source> <translation>Раздвинуть прямоугольное выделение на одну строку вниз</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1332"/> + <location filename="../QScintilla/MiniEditor.py" line="1331"/> <source>Alt+Ctrl+Down</source> <translation>Alt+Ctrl+Down</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1349"/> + <location filename="../QScintilla/MiniEditor.py" line="1348"/> <source>Extend rectangular selection up one line</source> <translation>Раздвинуть прямоугольное выделение на одну строку вверх</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1349"/> + <location filename="../QScintilla/MiniEditor.py" line="1348"/> <source>Alt+Ctrl+Up</source> <translation>Alt+Ctrl+Up</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1365"/> + <location filename="../QScintilla/MiniEditor.py" line="1364"/> <source>Extend rectangular selection left one character</source> <translation>Раздвинуть прямоугольное выделение на один символ влево</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1365"/> + <location filename="../QScintilla/MiniEditor.py" line="1364"/> <source>Alt+Ctrl+Left</source> <translation>Alt+Ctrl+Left</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1382"/> + <location filename="../QScintilla/MiniEditor.py" line="1381"/> <source>Extend rectangular selection right one character</source> <translation>Раздвинуть прямоугольное выделение на один символ вправо</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1382"/> + <location filename="../QScintilla/MiniEditor.py" line="1381"/> <source>Alt+Ctrl+Right</source> <translation>Alt+Ctrl+Right</translation> </message> @@ -62607,7 +64159,7 @@ <translation type="obsolete">Alt+Ctrl+End</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1437"/> + <location filename="../QScintilla/MiniEditor.py" line="1436"/> <source>Extend rectangular selection up one page</source> <translation>Раздвинуть прямоугольное выделение на одну страницу вверх</translation> </message> @@ -62617,7 +64169,7 @@ <translation type="obsolete">Alt+Ctrl+PgUp</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1451"/> + <location filename="../QScintilla/MiniEditor.py" line="1450"/> <source>Extend rectangular selection down one page</source> <translation>Раздвинуть прямоугольное выделение на одну страницу вниз</translation> </message> @@ -62632,7 +64184,7 @@ <translation type="obsolete">Переместиться на конец отображаемой строки</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1292"/> + <location filename="../QScintilla/MiniEditor.py" line="1291"/> <source>Alt+End</source> <translation>Alt+End</translation> </message> @@ -62642,302 +64194,302 @@ <translation type="obsolete">Раздвинуть выделение до конца строки</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1314"/> + <location filename="../QScintilla/MiniEditor.py" line="1313"/> <source>Formfeed</source> <translation>Formfeed</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1175"/> + <location filename="../ViewManager/ViewManager.py" line="1219"/> <source>Shorten empty lines</source> <translation>Укоротить пустые строки</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1177"/> + <location filename="../ViewManager/ViewManager.py" line="1221"/> <source><b>Shorten empty lines</b><p>Shorten lines consisting solely of whitespace characters.</p></source> <translation><b>Укоротить пустые строки</b> <p>Сделать пустыми строки, состоящие только из пробелльных символов.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1323"/> + <location filename="../QScintilla/MiniEditor.py" line="1322"/> <source>Escape</source> <translation>Escape</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1323"/> + <location filename="../QScintilla/MiniEditor.py" line="1322"/> <source>Esc</source> <translation>Esc</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1204"/> + <location filename="../ViewManager/ViewManager.py" line="1248"/> <source>Autocomplete from Document</source> <translation>Автозавершение из документа</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1214"/> + <location filename="../ViewManager/ViewManager.py" line="1258"/> <source>Autocomplete current word from Document</source> <translation>Автозавершение слова из документа</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1217"/> + <location filename="../ViewManager/ViewManager.py" line="1261"/> <source><b>Autocomplete from Document</b><p>Performs an autocompletion from document of the word containing the cursor.</p></source> <translation><b>Автозавершение из документа</b><p>Автоматически дополнить слово, содержащее курсор, из документа.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1227"/> + <location filename="../ViewManager/ViewManager.py" line="1271"/> <source>Autocomplete from APIs</source> <translation>Автозавершение из API</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1235"/> + <location filename="../ViewManager/ViewManager.py" line="1279"/> <source>Autocomplete current word from APIs</source> <translation>Автозавершение слова из API</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1238"/> + <location filename="../ViewManager/ViewManager.py" line="1282"/> <source><b>Autocomplete from APIs</b><p>Performs an autocompletion from APIs of the word containing the cursor.</p></source> <translation><b>Автозавершение из API</b><p>Автоматически дополнить слово, содержащее курсор, из API.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3728"/> + <location filename="../ViewManager/ViewManager.py" line="3772"/> <source>Goto Syntax Error</source> <translation>Перейти к синтаксической ошибке</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3722"/> + <location filename="../ViewManager/ViewManager.py" line="3766"/> <source>&Goto Syntax Error</source> <translation>&Перейти к синтаксической ошибке</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3730"/> + <location filename="../ViewManager/ViewManager.py" line="3774"/> <source><b>Goto Syntax Error</b><p>Go to next syntax error of the current editor.</p></source> <translation><b>Перейти к синтаксической ошибке</b> <p>Перейти к следующей синтаксической ошибке в текущем редакторе.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3743"/> + <location filename="../ViewManager/ViewManager.py" line="3787"/> <source>Clear Syntax Errors</source> <translation>Очистить синтаксические ошибки</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3738"/> + <location filename="../ViewManager/ViewManager.py" line="3782"/> <source>Clear &Syntax Errors</source> <translation>Очистить синтаксические &ошибки</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3745"/> + <location filename="../ViewManager/ViewManager.py" line="3789"/> <source><b>Clear Syntax Errors</b><p>Clear syntax errors of all editors.</p></source> <translation><b>Очистить синтаксические ошибки</b><p>Убрать сообщения об синтаксических ошибках во всех редакторах.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="679"/> + <location filename="../ViewManager/ViewManager.py" line="723"/> <source>Search File</source> <translation>Искать файл</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="679"/> + <location filename="../ViewManager/ViewManager.py" line="723"/> <source>Search &File...</source> <translation>Искать &файл...</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="685"/> + <location filename="../ViewManager/ViewManager.py" line="729"/> <source>Search for a file</source> <translation>Искать файл</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="687"/> + <location filename="../ViewManager/ViewManager.py" line="731"/> <source><b>Search File</b><p>Search for a file.</p></source> <translation><b>Искать файл</b><p>Искать файл по имени.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3810"/> + <location filename="../ViewManager/ViewManager.py" line="3854"/> <source>Next uncovered line</source> <translation>Следующая неохваченная строка</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3804"/> + <location filename="../ViewManager/ViewManager.py" line="3848"/> <source>&Next uncovered line</source> <translation>&Следующая неохваченная строка</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3812"/> + <location filename="../ViewManager/ViewManager.py" line="3856"/> <source><b>Next uncovered line</b><p>Go to next line of the current editor marked as not covered.</p></source> <translation><b>Следующая неохваченная строка</b><p>Перейти к строке в текущем редакторе, помеченной как неохваченная.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3828"/> + <location filename="../ViewManager/ViewManager.py" line="3872"/> <source>Previous uncovered line</source> <translation>Предыдущая неохваченная строка</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3821"/> + <location filename="../ViewManager/ViewManager.py" line="3865"/> <source>&Previous uncovered line</source> <translation>&Предыдущая неохваченная строка</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3830"/> + <location filename="../ViewManager/ViewManager.py" line="3874"/> <source><b>Previous uncovered line</b><p>Go to previous line of the current editor marked as not covered.</p></source> <translation><b>Следующая неохваченная строка</b><p>Перейти предыдущей к строке в текущем редакторе, помеченной как неохваченная.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="796"/> + <location filename="../ViewManager/ViewManager.py" line="840"/> <source>Alt+Backspace</source> <comment>Edit|Undo</comment> <translation>Alt+Backspace</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="855"/> + <location filename="../ViewManager/ViewManager.py" line="899"/> <source>Shift+Del</source> <comment>Edit|Cut</comment> <translation>Shift+Del</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="895"/> + <location filename="../ViewManager/ViewManager.py" line="939"/> <source>Shift+Ins</source> <comment>Edit|Paste</comment> <translation>Shift+Ins</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1109"/> + <location filename="../QScintilla/MiniEditor.py" line="1108"/> <source>Shift+Backspace</source> <translation>Shift+Backspace</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4155"/> + <location filename="../ViewManager/ViewManager.py" line="4200"/> <source><p>The file <b>{0}</b> has unsaved changes.</p></source> <translation><p>В файле <b>{0}</b> есть несохранённые изменения.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="544"/> + <location filename="../ViewManager/ViewManager.py" line="588"/> <source>Open a file</source> <translation>Открыть файл</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="546"/> + <location filename="../ViewManager/ViewManager.py" line="590"/> <source><b>Open a file</b><p>You will be asked for the name of a file to be opened in an editor window.</p></source> <translation><b>Открыть файл</b> <p>eric3 запросит у Вас имя файла, чтобы открыть его в окне редактора.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3092"/> + <location filename="../ViewManager/ViewManager.py" line="3136"/> <source>Quicksearch</source> <translation>Быстрый поиск</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2834"/> + <location filename="../ViewManager/ViewManager.py" line="2878"/> <source>Ctrl+Shift+K</source> <comment>Search|Quicksearch</comment> <translation>Ctrl+Shift+K</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2842"/> + <location filename="../ViewManager/ViewManager.py" line="2886"/> <source>Perform a quicksearch</source> <translation>Выполнить быстрый поиск</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2855"/> + <location filename="../ViewManager/ViewManager.py" line="2899"/> <source>Quicksearch backwards</source> <translation>Быстрый поиск назад</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2855"/> + <location filename="../ViewManager/ViewManager.py" line="2899"/> <source>Ctrl+Shift+J</source> <comment>Search|Quicksearch backwards</comment> <translation>Ctrl+Shift+J</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2863"/> + <location filename="../ViewManager/ViewManager.py" line="2907"/> <source>Perform a quicksearch backwards</source> <translation>Выполнить быстрый поиск назад</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2834"/> + <location filename="../ViewManager/ViewManager.py" line="2878"/> <source>&Quicksearch</source> <translation>&Быстрый поиск</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2855"/> + <location filename="../ViewManager/ViewManager.py" line="2899"/> <source>Quicksearch &backwards</source> <translation>Быстрый поиск &назад</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2875"/> + <location filename="../ViewManager/ViewManager.py" line="2919"/> <source>Quicksearch extend</source> <translation>Расширить быстрый поиск</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2875"/> + <location filename="../ViewManager/ViewManager.py" line="2919"/> <source>Quicksearch e&xtend</source> <translation>Рас&ширить быстрый поиск</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2875"/> + <location filename="../ViewManager/ViewManager.py" line="2919"/> <source>Ctrl+Shift+H</source> <comment>Search|Quicksearch extend</comment> <translation>Ctrl+Shift+H</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2883"/> + <location filename="../ViewManager/ViewManager.py" line="2927"/> <source>Extend the quicksearch to the end of the current word</source> <translation>Расширить быстрый поиск до конца текущего слова</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2886"/> + <location filename="../ViewManager/ViewManager.py" line="2930"/> <source><b>Quicksearch extend</b><p>This extends the quicksearch text to the end of the word currently found.</p></source> <translation><b>Расширить быстрый поиск</b> <p>Расширить быстрый поиск до конца найденного слова.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="988"/> + <location filename="../ViewManager/ViewManager.py" line="1032"/> <source>Smart indent</source> <translation>Умные отступы</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="996"/> + <location filename="../ViewManager/ViewManager.py" line="1040"/> <source>Smart indent Line or Selection</source> <translation>Форматировать строку или выделение умными отступами</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="998"/> + <location filename="../ViewManager/ViewManager.py" line="1042"/> <source><b>Smart indent</b><p>Indents the current line or the lines of the current selection smartly.</p></source> <translation><b>Умные отступы</b><p>Расставить отступы для выбранной строки (строк) с помощью умного алгоритма.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3414"/> + <location filename="../ViewManager/ViewManager.py" line="3458"/> <source>Next split</source> <translation>Следующий разделитель</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3414"/> + <location filename="../ViewManager/ViewManager.py" line="3458"/> <source>&Next split</source> <translation>&Следующий разделитель</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3421"/> + <location filename="../ViewManager/ViewManager.py" line="3465"/> <source>Move to the next split</source> <translation>Переместиться на следующий разделитель</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3423"/> + <location filename="../ViewManager/ViewManager.py" line="3467"/> <source><b>Next split</b><p>Move to the next split.</p></source> <translation><b>Следующий разделитель</b><p>Переместиться на следующий разделитель.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3431"/> + <location filename="../ViewManager/ViewManager.py" line="3475"/> <source>Previous split</source> <translation>Предыдущий разделитель</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3431"/> + <location filename="../ViewManager/ViewManager.py" line="3475"/> <source>&Previous split</source> <translation>&Предыдущий разделитель</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3437"/> + <location filename="../ViewManager/ViewManager.py" line="3481"/> <source>Move to the previous split</source> <translation>Переместиться на предыдущий разделитель</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3439"/> + <location filename="../ViewManager/ViewManager.py" line="3483"/> <source><b>Previous split</b><p>Move to the previous split.</p></source> <translation><b>Предыдущий разделитель</b><p>Переместиться на предыдущий разделитель.</p></translation> </message> @@ -62947,569 +64499,569 @@ <translation type="obsolete">Ctrl+U</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1184"/> + <location filename="../QScintilla/MiniEditor.py" line="1183"/> <source>Enter</source> <translation>Ввод</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1258"/> + <location filename="../ViewManager/ViewManager.py" line="1302"/> <source>Autocomplete current word from Document and APIs</source> <translation>Автозавершение слова из документа и API</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1248"/> + <location filename="../ViewManager/ViewManager.py" line="1292"/> <source>Autocomplete from Document and APIs</source> <translation>Автозавершение из документа и файлов API</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1248"/> + <location filename="../ViewManager/ViewManager.py" line="1292"/> <source>Alt+Shift+Space</source> <comment>Edit|Autocomplete from Document and APIs</comment> <translation>Alt+Shift+Space</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1261"/> + <location filename="../ViewManager/ViewManager.py" line="1305"/> <source><b>Autocomplete from Document and APIs</b><p>Performs an autocompletion from document and APIs of the word containing the cursor.</p></source> <translation><b>Автозавершение из документа и файлов API</b><p>Автоматически дополнить слово, содержащее курсор, из документа и файлов API.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3288"/> + <location filename="../ViewManager/ViewManager.py" line="3332"/> <source>Toggle all folds (including children)</source> <translation>Переключить все свёртки кода (включая дочерние)</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3282"/> + <location filename="../ViewManager/ViewManager.py" line="3326"/> <source>Toggle all &folds (including children)</source> <translation>Переключить все &свёртки кода (включая дочерние)</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3290"/> + <location filename="../ViewManager/ViewManager.py" line="3334"/> <source><b>Toggle all folds (including children)</b><p>Toggle all folds of the current editor including all children.</p></source> <translation><b>Переключить все свёртки кода (включая дочерние)</b><p>Переключить все свёртки кода в текущем редакторе, включая все дочерние.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1840"/> + <location filename="../QScintilla/MiniEditor.py" line="1839"/> <source>Duplicate current selection</source> <translation>Сдублировать текущее выделение</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1840"/> + <location filename="../QScintilla/MiniEditor.py" line="1839"/> <source>Ctrl+Shift+D</source> <translation>Ctrl+Shift+D</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="519"/> + <location filename="../ViewManager/ViewManager.py" line="563"/> <source>Ctrl+N</source> <comment>File|New</comment> <translation>Ctrl+N</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="537"/> + <location filename="../ViewManager/ViewManager.py" line="581"/> <source>Ctrl+O</source> <comment>File|Open</comment> <translation>Ctrl+O</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="557"/> + <location filename="../ViewManager/ViewManager.py" line="601"/> <source>Ctrl+W</source> <comment>File|Close</comment> <translation>Ctrl+W</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="592"/> + <location filename="../ViewManager/ViewManager.py" line="636"/> <source>Ctrl+S</source> <comment>File|Save</comment> <translation>Ctrl+S</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="609"/> + <location filename="../ViewManager/ViewManager.py" line="653"/> <source>Shift+Ctrl+S</source> <comment>File|Save As</comment> <translation>Shift+Ctrl+S</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="644"/> + <location filename="../ViewManager/ViewManager.py" line="688"/> <source>Ctrl+P</source> <comment>File|Print</comment> <translation>Ctrl+P</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="679"/> + <location filename="../ViewManager/ViewManager.py" line="723"/> <source>Alt+Ctrl+F</source> <comment>File|Search File</comment> <translation>Alt+Ctrl+F</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="701"/> + <location filename="../ViewManager/ViewManager.py" line="745"/> <source>&File</source> <translation>&Файл</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="750"/> + <location filename="../ViewManager/ViewManager.py" line="794"/> <source>File</source> <translation>Файл</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="796"/> + <location filename="../ViewManager/ViewManager.py" line="840"/> <source>Ctrl+Z</source> <comment>Edit|Undo</comment> <translation>Ctrl+Z</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="815"/> + <location filename="../ViewManager/ViewManager.py" line="859"/> <source>Ctrl+Shift+Z</source> <comment>Edit|Redo</comment> <translation>Ctrl+Shift+Z</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="833"/> + <location filename="../ViewManager/ViewManager.py" line="877"/> <source>Ctrl+Y</source> <comment>Edit|Revert</comment> <translation>Ctrl+Y</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="855"/> + <location filename="../ViewManager/ViewManager.py" line="899"/> <source>Ctrl+X</source> <comment>Edit|Cut</comment> <translation>Ctrl+X</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="875"/> + <location filename="../ViewManager/ViewManager.py" line="919"/> <source>Ctrl+C</source> <comment>Edit|Copy</comment> <translation>Ctrl+C</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="875"/> + <location filename="../ViewManager/ViewManager.py" line="919"/> <source>Ctrl+Ins</source> <comment>Edit|Copy</comment> <translation>Ctrl+Ins</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="895"/> + <location filename="../ViewManager/ViewManager.py" line="939"/> <source>Ctrl+V</source> <comment>Edit|Paste</comment> <translation>Ctrl+V</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="915"/> + <location filename="../ViewManager/ViewManager.py" line="959"/> <source>Alt+Shift+C</source> <comment>Edit|Clear</comment> <translation>Alt+Shift+C</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="950"/> + <location filename="../ViewManager/ViewManager.py" line="994"/> <source>Ctrl+I</source> <comment>Edit|Indent</comment> <translation>Ctrl+I</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="969"/> + <location filename="../ViewManager/ViewManager.py" line="1013"/> <source>Ctrl+Shift+I</source> <comment>Edit|Unindent</comment> <translation>Ctrl+Shift+I</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="988"/> + <location filename="../ViewManager/ViewManager.py" line="1032"/> <source>Ctrl+Alt+I</source> <comment>Edit|Smart indent</comment> <translation>Ctrl+Alt+I</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1007"/> + <location filename="../ViewManager/ViewManager.py" line="1051"/> <source>Ctrl+M</source> <comment>Edit|Comment</comment> <translation>Ctrl+M</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1026"/> + <location filename="../ViewManager/ViewManager.py" line="1070"/> <source>Alt+Ctrl+M</source> <comment>Edit|Uncomment</comment> <translation>Alt+Ctrl+M</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1100"/> + <location filename="../ViewManager/ViewManager.py" line="1144"/> <source>Ctrl+E</source> <comment>Edit|Select to brace</comment> <translation>Ctrl+E</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1118"/> + <location filename="../ViewManager/ViewManager.py" line="1162"/> <source>Ctrl+A</source> <comment>Edit|Select all</comment> <translation>Ctrl+A</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1135"/> + <location filename="../ViewManager/ViewManager.py" line="1179"/> <source>Alt+Ctrl+A</source> <comment>Edit|Deselect all</comment> <translation>Alt+Ctrl+A</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1186"/> + <location filename="../ViewManager/ViewManager.py" line="1230"/> <source>Ctrl+Space</source> <comment>Edit|Autocomplete</comment> <translation>Ctrl+Space</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1204"/> + <location filename="../ViewManager/ViewManager.py" line="1248"/> <source>Ctrl+Shift+Space</source> <comment>Edit|Autocomplete from Document</comment> <translation>Ctrl+Shift+Space</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1227"/> + <location filename="../ViewManager/ViewManager.py" line="1271"/> <source>Ctrl+Alt+Space</source> <comment>Edit|Autocomplete from APIs</comment> <translation>Ctrl+Alt+Space</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2601"/> + <location filename="../ViewManager/ViewManager.py" line="2645"/> <source>&Edit</source> <translation>&Правка</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2656"/> + <location filename="../ViewManager/ViewManager.py" line="2700"/> <source>Edit</source> <translation>Редактировать</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1861"/> + <location filename="../QScintilla/MiniEditor.py" line="1860"/> <source>Ctrl+F</source> <comment>Search|Search</comment> <translation>Ctrl+F</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1941"/> + <location filename="../QScintilla/MiniEditor.py" line="1940"/> <source>Ctrl+R</source> <comment>Search|Replace</comment> <translation>Ctrl+R</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2896"/> + <location filename="../ViewManager/ViewManager.py" line="2940"/> <source>Ctrl+G</source> <comment>Search|Goto Line</comment> <translation>Ctrl+G</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2915"/> + <location filename="../ViewManager/ViewManager.py" line="2959"/> <source>Ctrl+L</source> <comment>Search|Goto Brace</comment> <translation>Ctrl+L</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2998"/> + <location filename="../ViewManager/ViewManager.py" line="3042"/> <source>Shift+Ctrl+F</source> <comment>Search|Search Files</comment> <translation>Shift+Ctrl+F</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3192"/> + <location filename="../ViewManager/ViewManager.py" line="3236"/> <source>Ctrl++</source> <comment>View|Zoom in</comment> <translation>Ctrl++</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3211"/> + <location filename="../ViewManager/ViewManager.py" line="3255"/> <source>Ctrl+-</source> <comment>View|Zoom out</comment> <translation>Ctrl+-</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3249"/> + <location filename="../ViewManager/ViewManager.py" line="3293"/> <source>Ctrl+#</source> <comment>View|Zoom</comment> <translation>Ctrl+#</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3414"/> + <location filename="../ViewManager/ViewManager.py" line="3458"/> <source>Ctrl+Alt+N</source> <comment>View|Next split</comment> <translation>Ctrl+Alt+N</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3431"/> + <location filename="../ViewManager/ViewManager.py" line="3475"/> <source>Ctrl+Alt+P</source> <comment>View|Previous split</comment> <translation>Ctrl+Alt+P</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3480"/> + <location filename="../ViewManager/ViewManager.py" line="3524"/> <source>&View</source> <translation>&Вид</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3513"/> + <location filename="../ViewManager/ViewManager.py" line="3557"/> <source>View</source> <translation>Вид</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3633"/> + <location filename="../ViewManager/ViewManager.py" line="3677"/> <source>&Macros</source> <translation>&Макросы</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3650"/> + <location filename="../ViewManager/ViewManager.py" line="3694"/> <source>Alt+Ctrl+T</source> <comment>Bookmark|Toggle</comment> <translation>Alt+Ctrl+T</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3669"/> + <location filename="../ViewManager/ViewManager.py" line="3713"/> <source>Ctrl+PgDown</source> <comment>Bookmark|Next</comment> <translation>Ctrl+PgDown</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3687"/> + <location filename="../ViewManager/ViewManager.py" line="3731"/> <source>Ctrl+PgUp</source> <comment>Bookmark|Previous</comment> <translation>Ctrl+PgUp</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3705"/> + <location filename="../ViewManager/ViewManager.py" line="3749"/> <source>Alt+Ctrl+C</source> <comment>Bookmark|Clear</comment> <translation>Alt+Ctrl+C</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3965"/> + <location filename="../ViewManager/ViewManager.py" line="4009"/> <source>Bookmarks</source> <translation>Закладки</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4119"/> + <location filename="../ViewManager/ViewManager.py" line="4159"/> <source>Open files</source> <translation>Открыть файлы</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3846"/> + <location filename="../ViewManager/ViewManager.py" line="3890"/> <source>Next Task</source> <translation>Следующая задача</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3840"/> + <location filename="../ViewManager/ViewManager.py" line="3884"/> <source>&Next Task</source> <translation>&Следующая задача</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3848"/> + <location filename="../ViewManager/ViewManager.py" line="3892"/> <source><b>Next Task</b><p>Go to next line of the current editor having a task.</p></source> <translation><b>Следующая задача</b> <p>Перейти к следующей строчке редактора, где определена задача.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3863"/> + <location filename="../ViewManager/ViewManager.py" line="3907"/> <source>Previous Task</source> <translation>Предыдущая задача</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3856"/> + <location filename="../ViewManager/ViewManager.py" line="3900"/> <source>&Previous Task</source> <translation>&Предыдущая задача</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3865"/> + <location filename="../ViewManager/ViewManager.py" line="3909"/> <source><b>Previous Task</b><p>Go to previous line of the current editor having a task.</p></source> <translation><b>Предыдущая задача</b><p>Перейти к предыдущей строчке редактора, где определена задача.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2582"/> + <location filename="../ViewManager/ViewManager.py" line="2626"/> <source>&Search</source> <translation>&Поиск</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1881"/> + <location filename="../QScintilla/MiniEditor.py" line="1880"/> <source>Search next</source> <translation>Искать следующее</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1881"/> + <location filename="../QScintilla/MiniEditor.py" line="1880"/> <source>Search &next</source> <translation>Искать &следующее</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1881"/> + <location filename="../QScintilla/MiniEditor.py" line="1880"/> <source>F3</source> <comment>Search|Search next</comment> <translation>F3</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1901"/> + <location filename="../QScintilla/MiniEditor.py" line="1900"/> <source>Search previous</source> <translation>Найти предыдущее</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1901"/> + <location filename="../QScintilla/MiniEditor.py" line="1900"/> <source>Search &previous</source> <translation>Найти &предыдущее</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1901"/> + <location filename="../QScintilla/MiniEditor.py" line="1900"/> <source>Shift+F3</source> <comment>Search|Search previous</comment> <translation>Shift+F3</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1109"/> + <location filename="../ViewManager/ViewManager.py" line="1153"/> <source><b>Select to brace</b><p>Select text of the current editor to the matching brace.</p></source> <translation><b>Выбрать до скобки</b><p>Выбрать текст в текущем редакторе до соответствующей скобки.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1127"/> + <location filename="../ViewManager/ViewManager.py" line="1171"/> <source><b>Select All</b><p>Select all text of the current editor.</p></source> <translation><b>Выбрать всё</b><p>Выбрать весь текст в текущем редакторе.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1144"/> + <location filename="../ViewManager/ViewManager.py" line="1188"/> <source><b>Deselect All</b><p>Deselect all text of the current editor.</p></source> <translation><b>Снять выделение</b><p>Снять выделение со всего текста в текущем редакторе.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="772"/> + <location filename="../ViewManager/ViewManager.py" line="816"/> <source>Export as</source> <translation>Экспортировать как</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3143"/> + <location filename="../ViewManager/ViewManager.py" line="3187"/> <source>Quicksearch Textedit</source> <translation>Быстрый поиск</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1921"/> + <location filename="../QScintilla/MiniEditor.py" line="1920"/> <source>Clear search markers</source> <translation>Очистить подсветку результатов поиска</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1921"/> + <location filename="../QScintilla/MiniEditor.py" line="1920"/> <source>Ctrl+3</source> <comment>Search|Clear search markers</comment> <translation>Ctrl+3</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1930"/> + <location filename="../QScintilla/MiniEditor.py" line="1929"/> <source>Clear all displayed search markers</source> <translation>Очистить подсветку всех результатов поиска</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1932"/> + <location filename="../QScintilla/MiniEditor.py" line="1931"/> <source><b>Clear search markers</b><p>Clear all displayed search markers.</p></source> <translation><b>Очистить подсветку результатов поиска</b><p>Очистить подсветку всех результатов поиска.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1889"/> + <location filename="../QScintilla/MiniEditor.py" line="1888"/> <source>Search next occurrence of text</source> <translation>Искать далее</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1891"/> + <location filename="../QScintilla/MiniEditor.py" line="1890"/> <source><b>Search next</b><p>Search the next occurrence of some text in the current editor. The previously entered searchtext and options are reused.</p></source> <translation><b>Искать далее</b><p>Искать далее в текущем редакторе.Использовать предыдущий шаблон поиска и настройки.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1909"/> + <location filename="../QScintilla/MiniEditor.py" line="1908"/> <source>Search previous occurrence of text</source> <translation>Искать назад</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1911"/> + <location filename="../QScintilla/MiniEditor.py" line="1910"/> <source><b>Search previous</b><p>Search the previous occurrence of some text in the current editor. The previously entered searchtext and options are reused.</p></source> <translation><b>Искать назад</b><p>Искать назад в текущем редакторе.Использовать предыдущий шаблон поиска и настройки.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2844"/> + <location filename="../ViewManager/ViewManager.py" line="2888"/> <source><b>Quicksearch</b><p>This activates the quicksearch function of the IDE by giving focus to the quicksearch entry field. If this field is already active and contains text, it searches for the next occurrence of this text.</p></source> <translation><b>Быстрый поиск</b><p>Активизировать быстрый поиск переместив фокус на входное поле быстрого поиска. Если это поле уже активно и содержит какой-нибудь текст, то произвести поиск этого текста.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2866"/> + <location filename="../ViewManager/ViewManager.py" line="2910"/> <source><b>Quicksearch backwards</b><p>This searches the previous occurrence of the quicksearch text.</p></source> <translation><b>Быстрый поиск назад</b><p>Искать назад текст из входного поля быстрого поиска.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3116"/> + <location filename="../ViewManager/ViewManager.py" line="3160"/> <source><p>Enter the searchtext directly into this field. The search will be performed case insensitive. The quicksearch function is activated upon activation of the quicksearch next action (default key Ctrl+Shift+K), if this entry field does not have the input focus. Otherwise it searches for the next occurrence of the text entered. The quicksearch backwards action (default key Ctrl+Shift+J) searches backward. Activating the 'quicksearch extend' action (default key Ctrl+Shift+H) extends the current searchtext to the end of the currently found word. The quicksearch can be ended by pressing the Return key while the quicksearch entry has the the input focus.</p></source> <translation><p>Введите текст для поиска. Поиск будет проводиться без учёта регистра. Если входное поле быстрого поиска не активно, то начать поиск можно используя клавиши Ctrl+Shift+K. Если активно, то производится поиск текста вводимого в это поле. Поиск назад можно активировать с помощью клавиш Ctrl+Shift+J. Если нажать Ctrl+Shift+H (расширить быстрый поиск), то текущий шаблон поиска расширяется до конца найденного слова. Если входное поле быстрого поиска активно, то выйти из режима поиска можно просто нажав клавишу "Ввод".</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1271"/> + <location filename="../ViewManager/ViewManager.py" line="1315"/> <source>Calltip</source> <translation>Подсказка</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1271"/> + <location filename="../ViewManager/ViewManager.py" line="1315"/> <source>&Calltip</source> <translation>&Подсказка</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1271"/> + <location filename="../ViewManager/ViewManager.py" line="1315"/> <source>Alt+Space</source> <comment>Edit|Calltip</comment> <translation></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1278"/> + <location filename="../ViewManager/ViewManager.py" line="1322"/> <source>Show Calltips</source> <translation>Показать подсказки</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1280"/> + <location filename="../ViewManager/ViewManager.py" line="1324"/> <source><b>Calltip</b><p>Show calltips based on the characters immediately to the left of the cursor.</p></source> <translation><b>Подсказки</b><p>Показать подсказки соответствующие символам слева от курсора.</p></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="457"/> + <location filename="../QScintilla/MiniEditor.py" line="456"/> <source>Print Preview</source> <translation>Предварительный просмотр печати</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="667"/> + <location filename="../ViewManager/ViewManager.py" line="711"/> <source>Print preview of the current file</source> <translation>Предварительный просмотр печати текущего файла</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="669"/> + <location filename="../ViewManager/ViewManager.py" line="713"/> <source><b>Print Preview</b><p>Print preview of the current editor window.</p></source> <translation><b>Предварительный просмотр печати</b><p>Предварительный просмотр печати текущего файла.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1917"/> + <location filename="../ViewManager/ViewManager.py" line="1961"/> <source>Insert new line below current line</source> <translation>Вставить новую строку после текущей</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1917"/> + <location filename="../ViewManager/ViewManager.py" line="1961"/> <source>Shift+Return</source> <translation></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1917"/> + <location filename="../ViewManager/ViewManager.py" line="1961"/> <source>Shift+Enter</source> <translation></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3018"/> + <location filename="../ViewManager/ViewManager.py" line="3062"/> <source>Replace in Files</source> <translation>Заменить в файлах</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3018"/> + <location filename="../ViewManager/ViewManager.py" line="3062"/> <source>Replace in F&iles...</source> <translation>Заменить в ф&айлах...</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3018"/> + <location filename="../ViewManager/ViewManager.py" line="3062"/> <source>Shift+Ctrl+R</source> <comment>Search|Replace in Files</comment> <translation></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3025"/> + <location filename="../ViewManager/ViewManager.py" line="3069"/> <source>Search for a text in files and replace it</source> <translation>Искать текст в файлах и заменить его</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3027"/> + <location filename="../ViewManager/ViewManager.py" line="3071"/> <source><b>Replace in Files</b><p>Search for some text in the files of a directory tree or the project and replace it. A dialog is shown to enter the searchtext, the replacement text and options for the search and to display the result.</p></source> <translation><b>Заменить в файлах</b><p>Искать текст в файлах проекта и заменить его. Окно диалога позволит ввести текст для поиска и текст замены, а так же покажет результат.</p></translation> </message> @@ -63524,13 +65076,13 @@ <translation type="obsolete">Проверка &орфографии...</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3998"/> + <location filename="../ViewManager/ViewManager.py" line="4042"/> <source>Shift+F7</source> <comment>Spelling|Spell Check</comment> <translation>Shift+F7</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4007"/> + <location filename="../ViewManager/ViewManager.py" line="4051"/> <source>Perform spell check of current editor</source> <translation>Проверить орфографию в текущем редакторе</translation> </message> @@ -63540,843 +65092,858 @@ <translation type="obsolete"><b>Проверка орфографии</b><p>Проверить орфографию в текущем редакторе.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4017"/> + <location filename="../ViewManager/ViewManager.py" line="4061"/> <source>Automatic spell checking</source> <translation>Автоматическая проверка орфографии</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4017"/> + <location filename="../ViewManager/ViewManager.py" line="4061"/> <source>&Automatic spell checking</source> <translation>&Автоматическая проверка орфографии</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4024"/> + <location filename="../ViewManager/ViewManager.py" line="4068"/> <source>(De-)Activate automatic spell checking</source> <translation>Запретить автоматическую проверку орфографии</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4026"/> + <location filename="../ViewManager/ViewManager.py" line="4070"/> <source><b>Automatic spell checking</b><p>Activate or deactivate the automatic spell checking function of all editors.</p></source> <translation><b>Автоматическая проверка орфографии</b><p>Запретить или разрешить автоматическую проверку орфографии.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4092"/> + <location filename="../ViewManager/ViewManager.py" line="4136"/> <source>Spelling</source> <translation>Проверка орфографии</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4467"/> + <location filename="../ViewManager/ViewManager.py" line="4512"/> <source>Line: {0:5}</source> <translation>Строка: {0:5}</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4473"/> + <location filename="../ViewManager/ViewManager.py" line="4518"/> <source>Pos: {0:5}</source> <translation>Позиция: {0:5}</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3760"/> + <location filename="../ViewManager/ViewManager.py" line="3804"/> <source>Next warning message</source> <translation>Следующее предупреждение</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3754"/> + <location filename="../ViewManager/ViewManager.py" line="3798"/> <source>&Next warning message</source> <translation>&Следующее предупреждение</translation> </message> <message> <location filename="../ViewManager/ViewManager.py" line="3762"/> <source><b>Next warning message</b><p>Go to next line of the current editor having a py3flakes warning.</p></source> - <translation><b>Следующее предупреждение</b><p>Перейти к следующему предупреждению</p></translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="3778"/> + <translation type="obsolete"><b>Следующее предупреждение</b><p>Перейти к следующему предупреждению</p></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="3822"/> <source>Previous warning message</source> <translation>Предыдущее предупреждение</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3771"/> + <location filename="../ViewManager/ViewManager.py" line="3815"/> <source>&Previous warning message</source> <translation>&Предыдущее предупреждение</translation> </message> <message> <location filename="../ViewManager/ViewManager.py" line="3780"/> <source><b>Previous warning message</b><p>Go to previous line of the current editor having a py3flakes warning.</p></source> - <translation><b>Предыдущее предупреждение</b><p>Перейти к предыдущему предупреждению</p></translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="3794"/> + <translation type="obsolete"><b>Предыдущее предупреждение</b><p>Перейти к предыдущему предупреждению</p></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="3838"/> <source>Clear Warning Messages</source> <translation>Очистить предупреждения</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3789"/> + <location filename="../ViewManager/ViewManager.py" line="3833"/> <source>Clear &Warning Messages</source> <translation>&Очистить предупреждения</translation> </message> <message> <location filename="../ViewManager/ViewManager.py" line="3796"/> <source><b>Clear Warning Messages</b><p>Clear py3flakes warning messages of all editors.</p></source> - <translation><b>Очистить предупреждения</b><p>Очистить предупреждения во всех окнах редактора.</p></translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="940"/> + <translation type="obsolete"><b>Очистить предупреждения</b><p>Очистить предупреждения во всех окнах редактора.</p></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="984"/> <source>Join Lines</source> <translation>Соединить строки</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="933"/> + <location filename="../ViewManager/ViewManager.py" line="977"/> <source>Ctrl+J</source> <comment>Edit|Join Lines</comment> <translation></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="942"/> + <location filename="../ViewManager/ViewManager.py" line="986"/> <source><b>Join Lines</b><p>Join the current and the next lines.</p></source> <translation><b>Соединить строки</b><p>Соединить текущую и следующую строки.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2942"/> + <location filename="../ViewManager/ViewManager.py" line="2986"/> <source>Goto Last Edit Location</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2933"/> - <source>Goto Last &Edit Location</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="2933"/> - <source>Ctrl+Shift+G</source> - <comment>Search|Goto Last Edit Location</comment> - <translation></translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="2944"/> - <source><b>Goto Last Edit Location</b><p>Go to the location of the last edit in the current editor.</p></source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="2953"/> - <source>Goto Previous Method or Class</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="2953"/> - <source>Ctrl+Shift+Up</source> - <comment>Search|Goto Previous Method or Class</comment> - <translation></translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="2963"/> - <source>Go to the previous method or class definition</source> - <translation type="unfinished"></translation> - </message> - <message> - <location filename="../ViewManager/ViewManager.py" line="2967"/> - <source><b>Goto Previous Method or Class</b><p>Goes to the line of the previous method or class definition and highlights the name.</p></source> - <translation type="unfinished"></translation> - </message> - <message> <location filename="../ViewManager/ViewManager.py" line="2977"/> - <source>Goto Next Method or Class</source> + <source>Goto Last &Edit Location</source> <translation type="unfinished"></translation> </message> <message> <location filename="../ViewManager/ViewManager.py" line="2977"/> + <source>Ctrl+Shift+G</source> + <comment>Search|Goto Last Edit Location</comment> + <translation></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="2988"/> + <source><b>Goto Last Edit Location</b><p>Go to the location of the last edit in the current editor.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="2997"/> + <source>Goto Previous Method or Class</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="2997"/> + <source>Ctrl+Shift+Up</source> + <comment>Search|Goto Previous Method or Class</comment> + <translation></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="3007"/> + <source>Go to the previous method or class definition</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="3011"/> + <source><b>Goto Previous Method or Class</b><p>Goes to the line of the previous method or class definition and highlights the name.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="3021"/> + <source>Goto Next Method or Class</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="3021"/> <source>Ctrl+Shift+Down</source> <comment>Search|Goto Next Method or Class</comment> <translation></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2985"/> + <location filename="../ViewManager/ViewManager.py" line="3029"/> <source>Go to the next method or class definition</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2987"/> + <location filename="../ViewManager/ViewManager.py" line="3031"/> <source><b>Goto Next Method or Class</b><p>Goes to the line of the next method or class definition and highlights the name.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3447"/> + <location filename="../ViewManager/ViewManager.py" line="3491"/> <source>Preview</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3452"/> + <location filename="../ViewManager/ViewManager.py" line="3496"/> <source>Preview the current file in the web browser</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3454"/> + <location filename="../ViewManager/ViewManager.py" line="3498"/> <source><b>Preview</b><p>This opens the web browser with a preview of the current file.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="589"/> + <location filename="../QScintilla/MiniEditor.py" line="588"/> <source>Meta+B</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="600"/> + <location filename="../QScintilla/MiniEditor.py" line="599"/> <source>Meta+F</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="612"/> + <location filename="../QScintilla/MiniEditor.py" line="611"/> <source>Meta+P</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="624"/> + <location filename="../QScintilla/MiniEditor.py" line="623"/> <source>Meta+N</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="684"/> + <location filename="../QScintilla/MiniEditor.py" line="683"/> <source>Move to first visible character in document line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="700"/> + <location filename="../QScintilla/MiniEditor.py" line="699"/> <source>Move to start of display line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="719"/> + <location filename="../QScintilla/MiniEditor.py" line="718"/> <source>Move to end of document line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="729"/> + <location filename="../QScintilla/MiniEditor.py" line="728"/> <source>Meta+E</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="789"/> + <location filename="../QScintilla/MiniEditor.py" line="788"/> <source>Meta+V</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="795"/> + <location filename="../QScintilla/MiniEditor.py" line="794"/> <source>Move to start of document</source> <translation>Сдвинуться в начало документа</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="810"/> + <location filename="../QScintilla/MiniEditor.py" line="809"/> <source>Move to end of document</source> <translation>Сдвинуться в конец документа</translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="852"/> + <location filename="../QScintilla/MiniEditor.py" line="851"/> <source>Meta+Shift+B</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="868"/> + <location filename="../QScintilla/MiniEditor.py" line="867"/> <source>Meta+Shift+F</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="884"/> + <location filename="../QScintilla/MiniEditor.py" line="883"/> <source>Meta+Shift+P</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="900"/> + <location filename="../QScintilla/MiniEditor.py" line="899"/> <source>Meta+Shift+N</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="972"/> + <location filename="../QScintilla/MiniEditor.py" line="971"/> <source>Extend selection to first visible character in document line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="990"/> + <location filename="../QScintilla/MiniEditor.py" line="989"/> <source>Extend selection to end of document line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="998"/> + <location filename="../QScintilla/MiniEditor.py" line="997"/> <source>Meta+Shift+E</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1058"/> + <location filename="../QScintilla/MiniEditor.py" line="1057"/> <source>Meta+Shift+V</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1064"/> + <location filename="../QScintilla/MiniEditor.py" line="1063"/> <source>Extend selection to start of document</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1072"/> + <location filename="../QScintilla/MiniEditor.py" line="1071"/> <source>Ctrl+Shift+Up</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1081"/> + <location filename="../QScintilla/MiniEditor.py" line="1080"/> <source>Extend selection to end of document</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1089"/> + <location filename="../QScintilla/MiniEditor.py" line="1088"/> <source>Ctrl+Shift+Down</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1106"/> + <location filename="../QScintilla/MiniEditor.py" line="1105"/> <source>Meta+H</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1115"/> + <location filename="../QScintilla/MiniEditor.py" line="1114"/> <source>Delete previous character if not at start of line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1134"/> + <location filename="../QScintilla/MiniEditor.py" line="1133"/> <source>Meta+D</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1175"/> + <location filename="../QScintilla/MiniEditor.py" line="1174"/> <source>Meta+K</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1281"/> + <location filename="../QScintilla/MiniEditor.py" line="1280"/> <source>Move to end of display line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1298"/> + <location filename="../QScintilla/MiniEditor.py" line="1297"/> <source>Extend selection to end of display line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1343"/> + <location filename="../QScintilla/MiniEditor.py" line="1342"/> <source>Meta+Alt+Shift+N</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1359"/> + <location filename="../QScintilla/MiniEditor.py" line="1358"/> <source>Meta+Alt+Shift+P</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1376"/> + <location filename="../QScintilla/MiniEditor.py" line="1375"/> <source>Meta+Alt+Shift+B</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1393"/> + <location filename="../QScintilla/MiniEditor.py" line="1392"/> <source>Meta+Alt+Shift+F</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1399"/> + <location filename="../QScintilla/MiniEditor.py" line="1398"/> <source>Extend rectangular selection to first visible character in document line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1418"/> + <location filename="../QScintilla/MiniEditor.py" line="1417"/> <source>Extend rectangular selection to end of document line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1428"/> + <location filename="../QScintilla/MiniEditor.py" line="1427"/> <source>Meta+Alt+Shift+E</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1431"/> + <location filename="../QScintilla/MiniEditor.py" line="1430"/> <source>Alt+Shift+End</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1451"/> + <location filename="../QScintilla/MiniEditor.py" line="1450"/> <source>Alt+Shift+PgDown</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1462"/> + <location filename="../QScintilla/MiniEditor.py" line="1461"/> <source>Meta+Alt+Shift+V</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1483"/> + <location filename="../QScintilla/MiniEditor.py" line="1482"/> <source>Scroll to start of document</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1498"/> + <location filename="../QScintilla/MiniEditor.py" line="1497"/> <source>Scroll to end of document</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1513"/> + <location filename="../QScintilla/MiniEditor.py" line="1512"/> <source>Scroll vertically to center current line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1521"/> + <location filename="../QScintilla/MiniEditor.py" line="1520"/> <source>Meta+L</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1528"/> + <location filename="../QScintilla/MiniEditor.py" line="1527"/> <source>Move to end of next word</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1543"/> + <location filename="../QScintilla/MiniEditor.py" line="1542"/> <source>Extend selection to end of next word</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1558"/> + <location filename="../QScintilla/MiniEditor.py" line="1557"/> <source>Move to end of previous word</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1570"/> + <location filename="../QScintilla/MiniEditor.py" line="1569"/> <source>Extend selection to end of previous word</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1582"/> + <location filename="../QScintilla/MiniEditor.py" line="1581"/> <source>Move to start of document line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1590"/> + <location filename="../QScintilla/MiniEditor.py" line="1589"/> <source>Meta+A</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1597"/> + <location filename="../QScintilla/MiniEditor.py" line="1596"/> <source>Extend selection to start of document line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1608"/> + <location filename="../QScintilla/MiniEditor.py" line="1607"/> <source>Meta+Shift+A</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1615"/> + <location filename="../QScintilla/MiniEditor.py" line="1614"/> <source>Extend rectangular selection to start of document line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1625"/> + <location filename="../QScintilla/MiniEditor.py" line="1624"/> <source>Meta+Alt+Shift+A</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1632"/> + <location filename="../QScintilla/MiniEditor.py" line="1631"/> <source>Extend selection to start of display line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1650"/> + <location filename="../QScintilla/MiniEditor.py" line="1649"/> <source>Move to start of display or document line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1664"/> + <location filename="../QScintilla/MiniEditor.py" line="1663"/> <source>Extend selection to start of display or document line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1679"/> + <location filename="../QScintilla/MiniEditor.py" line="1678"/> <source>Move to first visible character in display or document line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1696"/> + <location filename="../QScintilla/MiniEditor.py" line="1695"/> <source>Extend selection to first visible character in display or document line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1713"/> + <location filename="../QScintilla/MiniEditor.py" line="1712"/> <source>Move to end of display or document line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1727"/> + <location filename="../QScintilla/MiniEditor.py" line="1726"/> <source>Extend selection to end of display or document line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1742"/> + <location filename="../QScintilla/MiniEditor.py" line="1741"/> <source>Stuttered move up one page</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1754"/> + <location filename="../QScintilla/MiniEditor.py" line="1753"/> <source>Stuttered extend selection up one page</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1769"/> + <location filename="../QScintilla/MiniEditor.py" line="1768"/> <source>Stuttered move down one page</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1781"/> + <location filename="../QScintilla/MiniEditor.py" line="1780"/> <source>Stuttered extend selection down one page</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1796"/> + <location filename="../QScintilla/MiniEditor.py" line="1795"/> <source>Delete right to end of next word</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1806"/> + <location filename="../QScintilla/MiniEditor.py" line="1805"/> <source>Alt+Del</source> <translation></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1813"/> + <location filename="../QScintilla/MiniEditor.py" line="1812"/> <source>Move selected lines up one line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1827"/> + <location filename="../QScintilla/MiniEditor.py" line="1826"/> <source>Move selected lines down one line</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../QScintilla/MiniEditor.py" line="1437"/> + <location filename="../QScintilla/MiniEditor.py" line="1436"/> <source>Alt+Shift+PgUp</source> <translation></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1045"/> + <location filename="../ViewManager/ViewManager.py" line="1089"/> <source>Toggle Comment</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1045"/> + <location filename="../ViewManager/ViewManager.py" line="1089"/> <source>Ctrl+Shift+M</source> <comment>Edit|Toggle Comment</comment> <translation></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1053"/> + <location filename="../ViewManager/ViewManager.py" line="1097"/> <source>Toggle the comment of the current line, selection or comment block</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1057"/> + <location filename="../ViewManager/ViewManager.py" line="1101"/> <source><b>Toggle Comment</b><p>If the current line does not start with a block comment, the current line or selection is commented. If it is already commented, this comment block is uncommented. </p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3230"/> + <location filename="../ViewManager/ViewManager.py" line="3274"/> <source>Zoom reset</source> <translation>Сбросить масштаб</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3230"/> + <location filename="../ViewManager/ViewManager.py" line="3274"/> <source>Zoom &reset</source> <translation>&Сбросить масштаб</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3230"/> + <location filename="../ViewManager/ViewManager.py" line="3274"/> <source>Ctrl+0</source> <comment>View|Zoom reset</comment> <translation>Ctrl+0</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3238"/> + <location filename="../ViewManager/ViewManager.py" line="3282"/> <source>Reset the zoom of the text</source> <translation>Сбросить масштаб текста</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3240"/> + <location filename="../ViewManager/ViewManager.py" line="3284"/> <source><b>Zoom reset</b><p>Reset the zoom of the text. This sets the zoom factor to 100%.</p></source> <translation><b>Сбросить масштаб</b><p>Сбросить масштаб текста, т.е. установить масштаб в 100%.</p></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3192"/> + <location filename="../ViewManager/ViewManager.py" line="3236"/> <source>Zoom In</source> <comment>View|Zoom in</comment> <translation type="unfinished">Увеличить масштаб</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3211"/> + <location filename="../ViewManager/ViewManager.py" line="3255"/> <source>Zoom Out</source> <comment>View|Zoom out</comment> <translation type="unfinished">Уменьшить масштаб</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="627"/> + <location filename="../ViewManager/ViewManager.py" line="671"/> <source>Save a&ll</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3880"/> + <location filename="../ViewManager/ViewManager.py" line="3924"/> <source>Next Change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3874"/> + <location filename="../ViewManager/ViewManager.py" line="3918"/> <source>&Next Change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3882"/> + <location filename="../ViewManager/ViewManager.py" line="3926"/> <source><b>Next Change</b><p>Go to next line of the current editor having a change marker.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3898"/> + <location filename="../ViewManager/ViewManager.py" line="3942"/> <source>Previous Change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3891"/> + <location filename="../ViewManager/ViewManager.py" line="3935"/> <source>&Previous Change</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3900"/> + <location filename="../ViewManager/ViewManager.py" line="3944"/> <source><b>Previous Change</b><p>Go to previous line of the current editor having a change marker.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3998"/> + <location filename="../ViewManager/ViewManager.py" line="4042"/> <source>Check spelling</source> <translation>Проверка орфографии</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3998"/> + <location filename="../ViewManager/ViewManager.py" line="4042"/> <source>Check &spelling...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4009"/> + <location filename="../ViewManager/ViewManager.py" line="4053"/> <source><b>Check spelling</b><p>Perform a spell check of the current editor.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4057"/> + <location filename="../ViewManager/ViewManager.py" line="4101"/> <source>Edit Dictionary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4059"/> + <location filename="../ViewManager/ViewManager.py" line="4103"/> <source>Project Word List</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4062"/> + <location filename="../ViewManager/ViewManager.py" line="4106"/> <source>Project Exception List</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4066"/> + <location filename="../ViewManager/ViewManager.py" line="4110"/> <source>User Word List</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4069"/> + <location filename="../ViewManager/ViewManager.py" line="4113"/> <source>User Exception List</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="6049"/> + <location filename="../ViewManager/ViewManager.py" line="6111"/> <source>Edit Spelling Dictionary</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="6024"/> + <location filename="../ViewManager/ViewManager.py" line="6086"/> <source>Editing {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="6009"/> + <location filename="../ViewManager/ViewManager.py" line="6071"/> <source><p>The spelling dictionary file <b>{0}</b> could not be read.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="6036"/> + <location filename="../ViewManager/ViewManager.py" line="6098"/> <source><p>The spelling dictionary file <b>{0}</b> could not be written.</p><p>Reason: {1}</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="6049"/> + <location filename="../ViewManager/ViewManager.py" line="6111"/> <source>The spelling dictionary was saved successfully.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2769"/> + <location filename="../ViewManager/ViewManager.py" line="2813"/> <source>Search current word forward</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2769"/> + <location filename="../ViewManager/ViewManager.py" line="2813"/> <source>Ctrl+.</source> <comment>Search|Search current word forward</comment> <translation>Ctrl+.</translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2780"/> + <location filename="../ViewManager/ViewManager.py" line="2824"/> <source>Search next occurrence of the current word</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2783"/> + <location filename="../ViewManager/ViewManager.py" line="2827"/> <source><b>Search current word forward</b><p>Search the next occurrence of the current word of the current editor.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2792"/> + <location filename="../ViewManager/ViewManager.py" line="2836"/> <source>Search current word backward</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2792"/> + <location filename="../ViewManager/ViewManager.py" line="2836"/> <source>Ctrl+,</source> <comment>Search|Search current word backward</comment> <translation></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2803"/> + <location filename="../ViewManager/ViewManager.py" line="2847"/> <source>Search previous occurrence of the current word</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="2806"/> + <location filename="../ViewManager/ViewManager.py" line="2850"/> <source><b>Search current word backward</b><p>Search the previous occurrence of the current word of the current editor.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3038"/> + <location filename="../ViewManager/ViewManager.py" line="3082"/> <source>Search in Open Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3038"/> + <location filename="../ViewManager/ViewManager.py" line="3082"/> <source>Search in Open Files...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3038"/> + <location filename="../ViewManager/ViewManager.py" line="3082"/> <source>Meta+Ctrl+Alt+F</source> <comment>Search|Search Open Files</comment> <translation></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3047"/> + <location filename="../ViewManager/ViewManager.py" line="3091"/> <source>Search for a text in open files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3049"/> + <location filename="../ViewManager/ViewManager.py" line="3093"/> <source><b>Search in Open Files</b><p>Search for some text in the currently opened files. A dialog is shown to enter the searchtext and options for the search and to display the result.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3059"/> + <location filename="../ViewManager/ViewManager.py" line="3103"/> <source>Replace in Open Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3059"/> + <location filename="../ViewManager/ViewManager.py" line="3103"/> <source>Meta+Ctrl+Alt+R</source> <comment>Search|Replace in Open Files</comment> <translation></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3067"/> + <location filename="../ViewManager/ViewManager.py" line="3111"/> <source>Search for a text in open files and replace it</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3069"/> + <location filename="../ViewManager/ViewManager.py" line="3113"/> <source><b>Replace in Open Files</b><p>Search for some text in the currently opened files and replace it. A dialog is shown to enter the searchtext, the replacement text and options for the search and to display the result.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3059"/> + <location filename="../ViewManager/ViewManager.py" line="3103"/> <source>Replace in Open Files...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1289"/> + <location filename="../ViewManager/ViewManager.py" line="1333"/> <source>Sort</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1289"/> + <location filename="../ViewManager/ViewManager.py" line="1333"/> <source>Ctrl+Alt+S</source> <comment>Edit|Sort</comment> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1296"/> + <location filename="../ViewManager/ViewManager.py" line="1340"/> <source>Sort the lines containing the rectangular selection</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="1299"/> + <location filename="../ViewManager/ViewManager.py" line="1343"/> <source><b>Sort</b><p>Sort the lines spanned by a rectangular selection based on the selection ignoring leading and trailing whitespace.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4492"/> + <location filename="../ViewManager/ViewManager.py" line="4537"/> <source>Language: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="4500"/> + <location filename="../ViewManager/ViewManager.py" line="4545"/> <source>EOL Mode: {0}</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3331"/> + <location filename="../ViewManager/ViewManager.py" line="3375"/> <source>New Document View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3331"/> + <location filename="../ViewManager/ViewManager.py" line="3375"/> <source>New &Document View</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3336"/> + <location filename="../ViewManager/ViewManager.py" line="3380"/> <source>Open a new view of the current document</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3338"/> + <location filename="../ViewManager/ViewManager.py" line="3382"/> <source><b>New Document View</b><p>Opens a new view of the current document. Both views show the same document. However, the cursors may be positioned independently.</p></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3348"/> + <location filename="../ViewManager/ViewManager.py" line="3392"/> <source>New Document View (with new split)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3355"/> + <location filename="../ViewManager/ViewManager.py" line="3399"/> <source>Open a new view of the current document in a new split</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../ViewManager/ViewManager.py" line="3358"/> + <location filename="../ViewManager/ViewManager.py" line="3402"/> <source><b>New Document View</b><p>Opens a new view of the current document in a new split. Both views show the same document. However, the cursors may be positioned independently.</p></source> <translation type="unfinished"></translation> </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="3806"/> + <source><b>Next warning message</b><p>Go to next line of the current editor having a pyflakes warning.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="3824"/> + <source><b>Previous warning message</b><p>Go to previous line of the current editor having a pyflakes warning.</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../ViewManager/ViewManager.py" line="3840"/> + <source><b>Clear Warning Messages</b><p>Clear pyflakes warning messages of all editors.</p></source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>ViewProfileDialog</name> @@ -64872,12 +66439,12 @@ <context> <name>WidgetArea</name> <message> - <location filename="../Tools/TRPreviewer.py" line="781"/> + <location filename="../Tools/TRPreviewer.py" line="779"/> <source>Load UI File</source> <translation>Загрузить файл UI</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="781"/> + <location filename="../Tools/TRPreviewer.py" line="779"/> <source><p>The file <b>{0}</b> could not be loaded.</p></source> <translation><p>Невозможно загрузить файл: <b>{0}</b></p></translation> </message> @@ -64885,12 +66452,12 @@ <context> <name>WidgetView</name> <message> - <location filename="../Tools/TRPreviewer.py" line="725"/> + <location filename="../Tools/TRPreviewer.py" line="723"/> <source>Load UI File</source> <translation>Загрузить файл UI</translation> </message> <message> - <location filename="../Tools/TRPreviewer.py" line="725"/> + <location filename="../Tools/TRPreviewer.py" line="723"/> <source><p>The file <b>{0}</b> could not be loaded.</p></source> <translation><p>Невозможно загрузить файл: <b>{0}</b></p></translation> </message> @@ -65051,17 +66618,17 @@ <context> <name>mercurial</name> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2038"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2070"/> <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="2048"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2080"/> <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="2057"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2089"/> <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> @@ -65072,30 +66639,30 @@ </table></p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2030"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2062"/> <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="2033"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2065"/> <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="2053"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2085"/> <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="1364"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1386"/> <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="1384"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1406"/> <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> @@ -65122,12 +66689,12 @@ {2}</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2043"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2075"/> <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="1424"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1444"/> <source><h3>Repository information</h3> <p><table> <tr><td><b>Mercurial V.</b></td><td>{0}</td></tr> @@ -65436,57 +67003,135 @@ <message> <location filename="../Utilities/py3flakes/messages.py" line="60"/> <source>{0!r} imported but unused.</source> - <translation>Модуль {0!r} импортирован но не используется.</translation> + <translation type="obsolete">Модуль {0!r} импортирован но не используется.</translation> </message> <message> <location filename="../Utilities/py3flakes/messages.py" line="80"/> <source>Redefinition of unused {0!r} from line {1!r}.</source> - <translation>Переопределение неиспользуемого {0!r} со строки {1!r}.</translation> + <translation type="obsolete">Переопределение неиспользуемого {0!r} со строки {1!r}.</translation> </message> <message> <location filename="../Utilities/py3flakes/messages.py" line="101"/> <source>Import {0!r} from line {1!r} shadowed by loop variable.</source> - <translation>Импорт {0!r} (строка {1!r}) скрывается переменной цикла.</translation> + <translation type="obsolete">Импорт {0!r} (строка {1!r}) скрывается переменной цикла.</translation> </message> <message> <location filename="../Utilities/py3flakes/messages.py" line="122"/> <source>'from {0} import *' used; unable to detect undefined names.</source> - <translation>Использование 'from {0} import *' делает детектирование неопределённых имён невозможным.</translation> + <translation type="obsolete">Использование 'from {0} import *' делает детектирование неопределённых имён невозможным.</translation> </message> <message> <location filename="../Utilities/py3flakes/messages.py" line="142"/> <source>Undefined name {0!r}.</source> - <translation>Неопределённое имя {0!r}.</translation> + <translation type="obsolete">Неопределённое имя {0!r}.</translation> </message> <message> <location filename="../Utilities/py3flakes/messages.py" line="160"/> <source>Undefined name {0!r} in __all__.</source> - <translation>Неопределённое имя {0!r} в __all__.</translation> + <translation type="obsolete">Неопределённое имя {0!r} в __all__.</translation> </message> <message> <location filename="../Utilities/py3flakes/messages.py" line="179"/> <source>Local variable {0!r} (defined in enclosing scope on line {1!r}) referenced before assignment.</source> - <translation>Использование неопределённой локальной переменной {0!r} (будет определённа только в строке {1!r}).</translation> + <translation type="obsolete">Использование неопределённой локальной переменной {0!r} (будет определённа только в строке {1!r}).</translation> </message> <message> <location filename="../Utilities/py3flakes/messages.py" line="201"/> <source>Duplicate argument {0!r} in function definition.</source> - <translation>Повторное использование аргумента {0!r} в определении функции.</translation> + <translation type="obsolete">Повторное использование аргумента {0!r} в определении функции.</translation> </message> <message> <location filename="../Utilities/py3flakes/messages.py" line="221"/> <source>Redefinition of function {0!r} from line {1!r}.</source> - <translation>Переопределение функции {0!r} (строка {1!r}).</translation> + <translation type="obsolete">Переопределение функции {0!r} (строка {1!r}).</translation> </message> <message> <location filename="../Utilities/py3flakes/messages.py" line="242"/> <source>Future import(s) {0!r} after other statements.</source> - <translation>Импорт {0!r} внутри кода.</translation> + <translation type="obsolete">Импорт {0!r} внутри кода.</translation> </message> <message> <location filename="../Utilities/py3flakes/messages.py" line="265"/> <source>Local variable {0!r} is assigned to but never used.</source> - <translation>Неиспользуемая локальная переменная {0!r}.</translation> + <translation type="obsolete">Неиспользуемая локальная переменная {0!r}.</translation> + </message> +</context> +<context> + <name>pyFlakes</name> + <message> + <location filename="../Utilities/pyflakes/translations.py" line="15"/> + <source>{0!r} imported but unused.</source> + <translation type="unfinished">Модуль {0!r} импортирован но не используется.</translation> + </message> + <message> + <location filename="../Utilities/pyflakes/translations.py" line="18"/> + <source>Redefinition of unused {0!r} from line {1!r}.</source> + <translation type="unfinished">Переопределение неиспользуемого {0!r} со строки {1!r}.</translation> + </message> + <message> + <location filename="../Utilities/pyflakes/translations.py" line="21"/> + <source>Import {0!r} from line {1!r} shadowed by loop variable.</source> + <translation type="unfinished">Импорт {0!r} (строка {1!r}) скрывается переменной цикла.</translation> + </message> + <message> + <location filename="../Utilities/pyflakes/translations.py" line="24"/> + <source>'from {0} import *' used; unable to detect undefined names.</source> + <translation type="unfinished">Использование 'from {0} import *' делает детектирование неопределённых имён невозможным.</translation> + </message> + <message> + <location filename="../Utilities/pyflakes/translations.py" line="27"/> + <source>Undefined name {0!r}.</source> + <translation type="unfinished">Неопределённое имя {0!r}.</translation> + </message> + <message> + <location filename="../Utilities/pyflakes/translations.py" line="30"/> + <source>Undefined name {0!r} in __all__.</source> + <translation type="unfinished">Неопределённое имя {0!r} в __all__.</translation> + </message> + <message> + <location filename="../Utilities/pyflakes/translations.py" line="33"/> + <source>Local variable {0!r} (defined in enclosing scope on line {1!r}) referenced before assignment.</source> + <translation type="unfinished">Использование неопределённой локальной переменной {0!r} (будет определённа только в строке {1!r}).</translation> + </message> + <message> + <location filename="../Utilities/pyflakes/translations.py" line="37"/> + <source>Duplicate argument {0!r} in function definition.</source> + <translation type="unfinished">Повторное использование аргумента {0!r} в определении функции.</translation> + </message> + <message> + <location filename="../Utilities/py3flakes/translations.py" line="40"/> + <source>Redefinition of function {0!r} from line {1!r}.</source> + <translation type="obsolete">Переопределение функции {0!r} (строка {1!r}).</translation> + </message> + <message> + <location filename="../Utilities/pyflakes/translations.py" line="43"/> + <source>Future import(s) {0!r} after other statements.</source> + <translation type="unfinished">Импорт {0!r} внутри кода.</translation> + </message> + <message> + <location filename="../Utilities/pyflakes/translations.py" line="46"/> + <source>Local variable {0!r} is assigned to but never used.</source> + <translation type="unfinished">Неиспользуемая локальная переменная {0!r}.</translation> + </message> + <message> + <location filename="../Utilities/pyflakes/translations.py" line="71"/> + <source>no message defined for code '{0}'</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Utilities/pyflakes/translations.py" line="40"/> + <source>Redefinition of {0!r} from line {1!r}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Utilities/pyflakes/translations.py" line="49"/> + <source>List comprehension redefines {0!r} from line {1!r}.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Utilities/pyflakes/translations.py" line="52"/> + <source>Syntax error detected in doctest.</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -65497,7 +67142,7 @@ <translation>неизвестный</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1591"/> + <location filename="../Plugins/VcsPlugins/vcsSubversion/subversion.py" line="1594"/> <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>