--- a/i18n/eric6_ru.ts Wed Jan 25 19:39:09 2017 +0100
+++ b/i18n/eric6_ru.ts Thu Jan 26 20:17:07 2017 +0100
@@ -390,7 +390,7 @@
<context>
<name>AddBookmarkDialog</name>
<message>
- <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.ui" line="26"/>
+ <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="198"/>
<source>Add Bookmark</source>
<translation>Добавить закладку</translation>
</message>
@@ -1700,7 +1700,7 @@
<translation>Удалить выбранные элементы</translation>
</message>
<message>
- <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/>
+ <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/>
<source>&Delete</source>
<translation>&Удалить</translation>
</message>
@@ -2423,12 +2423,12 @@
<translation>Сохранить трассировку вызовов как текстовый файл</translation>
</message>
<message>
- <location filename="../Debugger/CallTraceViewer.ui" line="109"/>
+ <location filename="../Debugger/CallTraceViewer.py" line="54"/>
<source>From</source>
<translation>От</translation>
</message>
<message>
- <location filename="../Debugger/CallTraceViewer.ui" line="114"/>
+ <location filename="../Debugger/CallTraceViewer.py" line="54"/>
<source>To</source>
<translation>До</translation>
</message>
@@ -2536,7 +2536,7 @@
<translation>Очистить список хостов</translation>
</message>
<message>
- <location filename="../Cooperation/ChatWidget.ui" line="230"/>
+ <location filename="../Cooperation/ChatWidget.py" line="513"/>
<source>Clear</source>
<translation>Очистить</translation>
</message>
@@ -2894,7 +2894,7 @@
<context>
<name>ClickToFlashWhitelistDialog</name>
<message>
- <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="14"/>
+ <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="54"/>
<source>ClickToFlash Whitelist</source>
<translation>Белый список ClickToFlash</translation>
</message>
@@ -4826,7 +4826,7 @@
<translation>Домен:</translation>
</message>
<message>
- <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/>
+ <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/>
<source><no cookie selected></source>
<translation><куки не выбраны></translation>
</message>
@@ -7417,7 +7417,7 @@
<context>
<name>DownloadManager</name>
<message>
- <location filename="../WebBrowser/Download/DownloadManager.ui" line="14"/>
+ <location filename="../WebBrowser/Download/DownloadManager.py" line="363"/>
<source>Downloads</source>
<translation>Загрузки</translation>
</message>
@@ -7881,92 +7881,92 @@
<translation>Стандартные кнопки</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="257"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="41"/>
<source>Abort</source>
<translation>Прервать</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="264"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="42"/>
<source>Apply</source>
<translation>Применить</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="271"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="43"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="278"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="44"/>
<source>Close</source>
<translation>Закрыть</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="285"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="45"/>
<source>Discard</source>
<translation>Сбросить</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="292"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="46"/>
<source>Help</source>
<translation>Справка</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="299"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="47"/>
<source>Ignore</source>
<translation>Игнорировать</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="306"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="48"/>
<source>No</source>
<translation>Нет</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="313"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="49"/>
<source>No to all</source>
<translation>Нет для всех</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="320"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="50"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="327"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="51"/>
<source>Open</source>
<translation>Открыть</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="334"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="52"/>
<source>Reset</source>
<translation>Сбросить</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="341"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="53"/>
<source>Restore defaults</source>
<translation>Восстановить умолчания</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="348"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="54"/>
<source>Retry</source>
<translation>Повтор</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="355"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="55"/>
<source>Save</source>
<translation>Сохранить</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="362"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="56"/>
<source>Save all</source>
<translation>Сохранить всё</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="369"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="57"/>
<source>Yes</source>
<translation>Да</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="376"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="58"/>
<source>Yes to all</source>
<translation>Да для всех</translation>
</message>
@@ -9985,7 +9985,7 @@
<translation>Выбор API-файла из списка установленных файлов</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="146"/>
+ <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/>
<source>Add from installed APIs</source>
<translation>Добавить из списка установленных файлов API</translation>
</message>
@@ -9995,7 +9995,7 @@
<translation>Выбор API-файла из списка API-файлов установленных плагинов</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="156"/>
+ <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="268"/>
<source>Add from Plugin APIs</source>
<translation>Добавить из списка файлов API, установленных с помощью плагинов</translation>
</message>
@@ -10005,7 +10005,7 @@
<translation>Компиляция выбранных определений API</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="173"/>
+ <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="301"/>
<source>Compile APIs</source>
<translation>Компилировать API</translation>
</message>
@@ -11143,7 +11143,7 @@
<translation>Выберите шрифт.</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/>
+ <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/>
<source>Font</source>
<translation>Шрифт</translation>
</message>
@@ -11153,7 +11153,7 @@
<translation>Разрешить заливку фона до конца строки.</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="113"/>
+ <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/>
<source>Fill to end of line</source>
<translation>Заливка до конца строки</translation>
</message>
@@ -12695,7 +12695,7 @@
<translation>Режим:</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/>
<source>Disabled</source>
<translation>Отключена</translation>
</message>
@@ -13414,7 +13414,7 @@
<context>
<name>EmailDialog</name>
<message>
- <location filename="../UI/EmailDialog.ui" line="13"/>
+ <location filename="../UI/EmailDialog.py" line="346"/>
<source>Send bug report</source>
<translation>Отправить сообщение об ошибке</translation>
</message>
@@ -14854,12 +14854,12 @@
<translation>Уведомления</translation>
</message>
<message>
- <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="122"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110"/>
<source>Host</source>
<translation>Хост</translation>
</message>
<message>
- <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="127"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="111"/>
<source>Permission</source>
<translation>Разрешение</translation>
</message>
@@ -14874,7 +14874,7 @@
<translation>Удалить все</translation>
</message>
<message>
- <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="97"/>
+ <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/>
<source>Geolocation</source>
<translation>Геолокация</translation>
</message>
@@ -16001,7 +16001,7 @@
<translation>Имя:</translation>
</message>
<message>
- <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/>
+ <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/>
<source><no flash cookie selected></source>
<translation><нет выделенных флэш-куки></translation>
</message>
@@ -16011,7 +16011,7 @@
<translation>Размер:</translation>
</message>
<message>
- <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="137"/>
+ <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="122"/>
<source>Origin:</source>
<translation>Источник:</translation>
</message>
@@ -16046,7 +16046,7 @@
<translation>Удалить выбранные флэш-куки</translation>
</message>
<message>
- <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="225"/>
+ <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="213"/>
<source>Remove Cookie</source>
<translation>Удалить куки</translation>
</message>
@@ -16475,7 +16475,7 @@
<context>
<name>GreaseMonkeyAddScriptDialog</name>
<message>
- <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.ui" line="14"/>
+ <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py" line="105"/>
<source>GreaseMonkey Script Installation</source>
<translation>Инсталляция GreaseMonkey скрипта</translation>
</message>
@@ -22083,7 +22083,7 @@
<context>
<name>HgAddSubrepositoryDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="14"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="98"/>
<source>Add Sub-repository</source>
<translation>Добавить субрепозиторий</translation>
</message>
@@ -23264,7 +23264,7 @@
<translation>Пометить выбранные конфликты как 'разрешенные'</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="73"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="246"/>
<source>Resolved</source>
<translation>Разрешённые</translation>
</message>
@@ -23274,7 +23274,7 @@
<translation>Пометить выбранные конфликты как 'неразрешенные'</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="83"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="244"/>
<source>Unresolved</source>
<translation>Неразрешённые</translation>
</message>
@@ -23867,7 +23867,7 @@
<translation>Задайте поле, по которому фильтровать</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="55"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="317"/>
<source>Revision</source>
<translation>Ревизия</translation>
</message>
@@ -24240,7 +24240,7 @@
<translation><p>Невозможно прочитать файл <b>{0}</b>.</p><p>Причина: {1}</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="14"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/>
<source>Edit Plan</source>
<translation>Изменение плана</translation>
</message>
@@ -24381,7 +24381,7 @@
<context>
<name>HgLogBrowserDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="14"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="73"/>
<source>Mercurial Log</source>
<translation>Mercurial: Журнал</translation>
</message>
@@ -24421,17 +24421,17 @@
<translation>Задайте поле, по которому фильтровать</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="181"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
<source>Revision</source>
<translation>Ревизия</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="191"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/>
<source>Author</source>
<translation>Автор</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="201"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/>
<source>Message</source>
<translation>Сообщение</translation>
</message>
@@ -24456,192 +24456,192 @@
<translation>Теги</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="274"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="277"/>
<source>Action</source>
<translation>Действие</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="279"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="282"/>
<source>Path</source>
<translation>Путь</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="284"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="287"/>
<source>Copy from</source>
<translation>Копия из</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="294"/>
- <source>Press to get the next bunch of log entries</source>
- <translation>Получить следующую порцию сообщений журнала</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="297"/>
+ <source>Press to get the next bunch of log entries</source>
+ <translation>Получить следующую порцию сообщений журнала</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="300"/>
<source>&Next</source>
<translation>&Далее</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="304"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="307"/>
<source>Enter the limit of entries to fetch</source>
<translation>Задайте максимальное количество получаемых записей </translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="336"/>
- <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="339"/>
+ <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="342"/>
<source>Stop on Copy/Move</source>
<translation>Стоп при копировании/перемещении</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="346"/>
- <source>Press to generate a diff to the first parent revision</source>
- <translation>Генерация различий с предыдущей ревизией</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="349"/>
+ <source>Press to generate a diff to the first parent revision</source>
+ <translation>Генерация различий с предыдущей ревизией</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="352"/>
<source>Diff to Parent &1</source>
<translation>Сравнить с предком &1</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="356"/>
- <source>Press to generate a diff to the second parent revision</source>
- <translation>Генерация различий с предпредыдущей ревизией</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="359"/>
+ <source>Press to generate a diff to the second parent revision</source>
+ <translation>Генерация различий с предпредыдущей ревизией</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="362"/>
<source>Diff to Parent &2</source>
<translation>Сравнить с предком &2</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="366"/>
- <source>Press to compare two revisions</source>
- <translation>Сравнить две ревизии</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="369"/>
+ <source>Press to compare two revisions</source>
+ <translation>Сравнить две ревизии</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="372"/>
<source>&Compare Revisions</source>
<translation>&Сравнить ревизии</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="430"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="433"/>
<source>Errors</source>
<translation>Ошибки</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="436"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="439"/>
<source><b>Mercurial log errors</b><p>This shows possible error messages of the hg log command.</p></source>
<translation><b>Журнал ошибок Mercurial</b><p>Отображение возможных ошибок команды hg log.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="452"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="455"/>
<source>Input</source>
<translation>Ввод</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="474"/>
- <source>Press to send the input to the hg process</source>
- <translation>Отправить данные процессу hg</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="477"/>
- <source>&Send</source>
- <translation>&Отправить</translation>
+ <source>Press to send the input to the hg process</source>
+ <translation>Отправить данные процессу hg</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="480"/>
+ <source>&Send</source>
+ <translation>&Отправить</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="483"/>
<source>Alt+S</source>
<translation>Alt+S</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="487"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="490"/>
<source>Enter data to be sent to the hg process</source>
<translation>Задайте данные, которые будут посланы процессу hg</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="494"/>
- <source>Select to switch the input field to password mode</source>
- <translation>Задать режим ввода пароля для поля ввода пароля</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="497"/>
- <source>&Password Mode</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="500"/>
+ <source>&Password Mode</source>
+ <translation>&Парольный режим</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="503"/>
<source>Alt+P</source>
<translation>Alt+P</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="159"/>
- <source>Added</source>
- <translation>Добавлен</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="160"/>
- <source>Deleted</source>
- <translation>Удален</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="161"/>
+ <source>Added</source>
+ <translation>Добавлен</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="162"/>
+ <source>Deleted</source>
+ <translation>Удален</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="163"/>
<source>Modified</source>
<translation>Модифицирован</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="139"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="141"/>
<source>All</source>
<translation>Все</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="666"/>
- <source>The hg process did not finish within 30s.</source>
- <translation>Процесс hg не завершился в течение 30 секунд.</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="669"/>
- <source>Could not start the hg executable.</source>
- <translation>Невозможно запустить исполняемый файл hg.</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="672"/>
+ <source>The hg process did not finish within 30s.</source>
+ <translation>Процесс hg не завершился в течение 30 секунд.</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="675"/>
+ <source>Could not start the hg executable.</source>
+ <translation>Невозможно запустить исполняемый файл hg.</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="678"/>
<source>Mercurial Error</source>
<translation> Mercurial: Ошибка</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="905"/>
<source>Process Generation Error</source>
<translation>Ошибка при запуске процесса</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="893"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="905"/>
<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.py" line="74"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="75"/>
<source>Mercurial Log (Incoming)</source>
<translation>Mercurial: Журнал (входящие)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="76"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="77"/>
<source>Mercurial Log (Outgoing)</source>
<translation>Mercurial: Журнал (исходящие)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="176"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="178"/>
<source>Bookmarks</source>
<translation>Закладки</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="86"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="87"/>
<source>Press to refresh the list of changesets</source>
<translation>Освежить список изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="84"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="85"/>
<source>&Refresh</source>
<translation>&Освежить</translation>
</message>
@@ -24651,84 +24651,84 @@
<translation>Фаза</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="194"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="198"/>
<source>Change the phase of the selected revisions</source>
<translation>Изменить фазу выбранных ревизий</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="200"/>
<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><b>Изменить фазу</b>
<p>Изменение фазы выбранных ревизий. Выбранные ревизии должны иметь одинаковую фазу.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="192"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="196"/>
<source>Change Phase</source>
<translation>Изменить фазу</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1721"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1752"/>
<source>Copy Changesets</source>
<translation>Копировать набор изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1944"/>
<source>The project should be reread. Do this now?</source>
<translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="402"/>
- <source>Select to show differences side-by-side</source>
- <translation>Разрешить построчный показ различий</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="405"/>
+ <source>Select to show differences side-by-side</source>
+ <translation>Разрешить построчный показ различий</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="408"/>
<source>Show differences side-by-side</source>
<translation>Показывать различия построчно</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="412"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="415"/>
<source>Select action from menu</source>
<translation>Выберите действие из меню</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="189"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="193"/>
<source>Copy the selected changesets to the current branch</source>
<translation>Копировать выбранные изменения в текущую ветвь</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="201"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="205"/>
<source>Tag</source>
<translation>Тег</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="204"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="208"/>
<source>Tag the selected revision</source>
<translation>Помеченная ревизия</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1773"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1804"/>
<source>Switch</source>
<translation>Переключиться</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="209"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="213"/>
<source>Switch the working directory to the selected revision</source>
<translation>Переключить рабочую директорию в выбранную ревизию</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="232"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="236"/>
<source>Pull Large Files</source>
<translation>Затянуть большие файлы</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="238"/>
<source>Pull large files for selected revisions</source>
<translation>Затягивать (загружать) большие файлы для выбранных ревизий</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="983"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="996"/>
<source>{0} (large file)</source>
<translation>{0} большой файл</translation>
</message>
@@ -24753,155 +24753,160 @@
<translation>Перейти к следующему вхождению</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="94"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/>
<source>Find</source>
<translation>Найти</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="95"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/>
<source>Filter</source>
<translation>Фильтр</translation>
</message>
<message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="111"/>
<source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr>{5}</table></source>
- <translation><table><tr><td><b>Ревизия</b></td><td>{0}</td></tr><tr><td><b>Дата</b></td><td>{1}</td></tr><tr><td><b>Автор</b></td><td>{2}</td></tr><tr><td><b>Ветвь</b></td><td>{3}</td></tr><tr><td><b>Предки</b></td><td>{4}</td></tr>{5}</table></translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="121"/>
+ <translation type="obsolete"><table><tr><td><b>Ревизия</b></td><td>{0}</td></tr><tr><td><b>Дата</b></td><td>{1}</td></tr><tr><td><b>Автор</b></td><td>{2}</td></tr><tr><td><b>Ветвь</b></td><td>{3}</td></tr><tr><td><b>Предки</b></td><td>{4}</td></tr>{5}</table></translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="123"/>
<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/HgLogBrowserDialog.py" line="124"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="126"/>
<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/HgLogBrowserDialog.py" line="2014"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2045"/>
<source>Find Commit</source>
<translation>Поиск фиксации</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2014"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="2045"/>
<source>'{0}' was not found.</source>
<translation>'{0}' не найдено.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="100"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="101"/>
<source>File</source>
<translation>Файл</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="165"/>
- <source>Draft</source>
- <translation>Draft</translation>
- </message>
- <message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="166"/>
- <source>Public</source>
- <translation>Public</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="167"/>
+ <source>Draft</source>
+ <translation>Draft</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="168"/>
+ <source>Public</source>
+ <translation>Public</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="169"/>
<source>Secret</source>
<translation>Secret</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1871"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1902"/>
<source>Pull Changes</source>
<translation>Затянуть изменения (pull)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="230"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="234"/>
<source>Pull changes from a remote repository</source>
<translation>Затягивание (загрузка) изменений из удалённого репозитория</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="243"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="247"/>
<source>Push Selected Changes</source>
<translation>Протолкнуть выбранные изменения</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="246"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="250"/>
<source>Push changes of the selected changeset and its ancestors to a remote repository</source>
<translation>Протолкнуть (передать) изменения выбранной ревизии и ее предков в удаленный репозиторий</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="249"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="253"/>
<source>Push All Changes</source>
<translation>Протолкнуть все изменения</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="252"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="256"/>
<source>Push all changes to a remote repository</source>
<translation>Проталкивание (передача) всех изменений в удаленный репозиторий</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1852"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1883"/>
<source>Fetch Changes</source>
<translation>Получить изменения (fetch)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1913"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1944"/>
<source>Strip Changesets</source>
<translation>Удалить наборы изменений (strip)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="238"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="242"/>
<source>Fetch changes from a remote repository</source>
<translation>Получение изменений из удалённого репозитория</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="260"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="264"/>
<source>Strip changesets from a repository</source>
<translation>Удаление наборов изменений из репозитория</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="214"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/>
<source>Define Bookmark...</source>
<translation>Определить закладку...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="217"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="221"/>
<source>Bookmark the selected revision</source>
<translation>Закладка выбранной ревизии</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="219"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/>
<source>Move Bookmark...</source>
<translation>Переместить закладку...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="222"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="226"/>
<source>Move bookmark to the selected revision</source>
<translation>Перемещение закладки в выбранную ревизию</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1825"/>
<source>Define Bookmark</source>
<translation>Определение закладки</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1794"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1825"/>
<source>Enter bookmark name for changeset "{0}":</source>
<translation>Введите имя закладки для набора изменений "{0}":</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1847"/>
<source>Move Bookmark</source>
<translation>Перемещение закладки</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1816"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1847"/>
<source>Select the bookmark to be moved to changeset "{0}":</source>
<translation>Выберите закладку для перемещения в набор изменений "{0}":</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1759"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1790"/>
<source>Select bookmark to switch to (leave empty to use revision):</source>
<translation>Выберите закладку для переключения (оставьте поле пустым для использования ревизии):</translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="112"/>
+ <source><table><tr><td><b>Revision</b></td><td>{0}</td></tr><tr><td><b>Date</b></td><td>{1}</td></tr><tr><td><b>Author</b></td><td>{2}</td></tr><tr><td><b>Branch</b></td><td>{3}</td></tr><tr><td><b>Parents</b></td><td>{4}</td></tr><tr><td><b>Children</b></td><td>{5}</td></tr>{6}</table></source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgLogDialog</name>
@@ -28359,7 +28364,7 @@
<context>
<name>HgStatusDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="14"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="313"/>
<source>Mercurial Status</source>
<translation>Mercurial: Статус </translation>
</message>
@@ -28501,7 +28506,7 @@
<translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/>
<source>Commit</source>
<translation>Фиксация</translation>
</message>
@@ -28621,7 +28626,7 @@
<translation>все</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="203"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="854"/>
<source>Differences</source>
<translation>Различия</translation>
</message>
@@ -29897,7 +29902,7 @@
<translation>Удалить выбранные записи</translation>
</message>
<message>
- <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/>
+ <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/>
<source>&Remove</source>
<translation>&Удалить</translation>
</message>
@@ -36054,92 +36059,92 @@
<translation>Стандартные кнопки</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="219"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="40"/>
<source>Apply</source>
<translation>Применить</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="226"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="39"/>
<source>Abort</source>
<translation>Прервать</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="233"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="41"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="240"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="45"/>
<source>Ignore</source>
<translation>Игнорировать</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="247"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="54"/>
<source>Save all</source>
<translation>Сохранить всё</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="254"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="53"/>
<source>Save</source>
<translation>Сохранить</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="261"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="43"/>
<source>Discard</source>
<translation>Сбросить</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="268"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="56"/>
<source>Yes to all</source>
<translation>Да для всех</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="275"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="49"/>
<source>Open</source>
<translation>Открыть</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="282"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="50"/>
<source>Reset</source>
<translation>Сбросить</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="289"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="48"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="296"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="46"/>
<source>No</source>
<translation>Нет</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="303"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="44"/>
<source>Help</source>
<translation>Справка</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="310"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="47"/>
<source>No to all</source>
<translation>Нет для всех</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="317"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="52"/>
<source>Retry</source>
<translation>Повтор</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="324"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="51"/>
<source>Restore defaults</source>
<translation>Восстановить умолчания</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="331"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="55"/>
<source>Yes</source>
<translation>Да</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="338"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="42"/>
<source>Close</source>
<translation>Закрыть</translation>
</message>
@@ -37851,7 +37856,7 @@
<context>
<name>NoCacheHostsDialog</name>
<message>
- <location filename="../Helpviewer/Network/NoCacheHostsDialog.ui" line="14"/>
+ <location filename="../Helpviewer/Network/NoCacheHostsDialog.py" line="52"/>
<source>Not Cached Hosts</source>
<translation>Некэшированные хосты</translation>
</message>
@@ -37959,7 +37964,7 @@
<translation>Задать координаты визуально</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/>
+ <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/>
<source>Visual Selection</source>
<translation>Визуальный выбор</translation>
</message>
@@ -38632,7 +38637,7 @@
<context>
<name>PasswordsDialog</name>
<message>
- <location filename="../WebBrowser/Passwords/PasswordsDialog.ui" line="14"/>
+ <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="91"/>
<source>Saved Passwords</source>
<translation>Сохранённые пароли</translation>
</message>
@@ -43425,7 +43430,7 @@
<translation>Выполнено</translation>
</message>
<message>
- <location filename="../DataViews/PyCoverageDialog.ui" line="172"/>
+ <location filename="../DataViews/PyCoverageDialog.py" line="349"/>
<source>Coverage</source>
<translation>Охват</translation>
</message>
@@ -43506,7 +43511,7 @@
</translation>
</message>
<message>
- <location filename="../DataViews/PyCoverageDialog.ui" line="192"/>
+ <location filename="../DataViews/PyCoverageDialog.py" line="345"/>
<source>%v/%m Files</source>
<translation>%v из %m файлов</translation>
</message>
@@ -43514,7 +43519,7 @@
<context>
<name>PyProfileDialog</name>
<message>
- <location filename="../DataViews/PyProfileDialog.ui" line="20"/>
+ <location filename="../DataViews/PyProfileDialog.py" line="233"/>
<source>Profile Results</source>
<translation>Результаты профайлера</translation>
</message>
@@ -48311,7 +48316,7 @@
<translation>Удалить выделенные фильтры</translation>
</message>
<message>
- <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="89"/>
+ <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="150"/>
<source>Remove Filters</source>
<translation>Удалить фильтры</translation>
</message>
@@ -48321,7 +48326,7 @@
<translation>Удалить выбранные атрибуты</translation>
</message>
<message>
- <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="99"/>
+ <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="178"/>
<source>Remove Attributes</source>
<translation>Удалить атрибуты</translation>
</message>
@@ -49849,7 +49854,7 @@
<context>
<name>SendRefererWhitelistDialog</name>
<message>
- <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.ui" line="14"/>
+ <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.py" line="52"/>
<source>Send Referer Whitelist</source>
<translation>Отправить реферер белого списка</translation>
</message>
@@ -51064,7 +51069,7 @@
<translation>К&опировать превью</translation>
</message>
<message>
- <location filename="../Snapshot/SnapWidget.ui" line="20"/>
+ <location filename="../Snapshot/SnapWidget.py" line="531"/>
<source>eric6 Snapshot</source>
<translation>Снимки eric6</translation>
</message>
@@ -53677,7 +53682,7 @@
<context>
<name>SvnDiffDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="14"/>
+ <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
<source>Subversion Diff</source>
<translation>Subversion: Отображение различий</translation>
</message>
@@ -53980,17 +53985,17 @@
<translation>Выберите поле, по которому фильтровать</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="112"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/>
<source>Revision</source>
<translation>Ревизия</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="117"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/>
<source>Author</source>
<translation>Автор</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="127"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/>
<source>Message</source>
<translation>Сообщение</translation>
</message>
@@ -54453,7 +54458,7 @@
<translation><b>URL</b><p>Задайте URL модуля. Репозиторий со стандартной раскладкой не должен содержать части trunk, tags или branches.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/>
<source>&URL:</source>
<translation>&URL репозитория:</translation>
</message>
@@ -54548,7 +54553,7 @@
<translation>Задайте протокол доступа к репозиторию</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/>
<source>&URL:</source>
<translation>&URL репозитория:</translation>
</message>
@@ -55758,7 +55763,7 @@
<context>
<name>SvnStatusDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/>
<source>Subversion Status</source>
<translation>Subversion: Статус</translation>
</message>
@@ -56035,7 +56040,7 @@
<translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="80"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="711"/>
<source>Commit</source>
<translation>Фиксация</translation>
</message>
@@ -61267,7 +61272,7 @@
<context>
<name>UnittestDialog</name>
<message>
- <location filename="../PyUnit/UnittestDialog.ui" line="14"/>
+ <location filename="../PyUnit/UnittestDialog.py" line="403"/>
<source>Unittest</source>
<translation>Unittest</translation>
</message>
