--- a/i18n/eric6_ru.ts Mon Oct 24 19:55:05 2016 +0200
+++ b/i18n/eric6_ru.ts Tue Oct 25 19:33:11 2016 +0200
@@ -390,7 +390,7 @@
<context>
<name>AddBookmarkDialog</name>
<message>
- <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.py" line="198"/>
+ <location filename="../WebBrowser/Bookmarks/AddBookmarkDialog.ui" line="26"/>
<source>Add Bookmark</source>
<translation>Добавить закладку</translation>
</message>
@@ -1680,7 +1680,7 @@
<translation>Удалить выбранные элементы</translation>
</message>
<message>
- <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/>
+ <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/>
<source>&Delete</source>
<translation>&Удалить</translation>
</message>
@@ -2403,12 +2403,12 @@
<translation>Сохранить трассировку вызовов как текстовый файл</translation>
</message>
<message>
- <location filename="../Debugger/CallTraceViewer.py" line="54"/>
+ <location filename="../Debugger/CallTraceViewer.ui" line="109"/>
<source>From</source>
<translation>От</translation>
</message>
<message>
- <location filename="../Debugger/CallTraceViewer.py" line="54"/>
+ <location filename="../Debugger/CallTraceViewer.ui" line="114"/>
<source>To</source>
<translation>До</translation>
</message>
@@ -2516,7 +2516,7 @@
<translation>Очистить список хостов</translation>
</message>
<message>
- <location filename="../Cooperation/ChatWidget.py" line="513"/>
+ <location filename="../Cooperation/ChatWidget.ui" line="230"/>
<source>Clear</source>
<translation>Очистить</translation>
</message>
@@ -2874,7 +2874,7 @@
<context>
<name>ClickToFlashWhitelistDialog</name>
<message>
- <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.py" line="54"/>
+ <location filename="../Helpviewer/WebPlugins/ClickToFlash/ClickToFlashWhitelistDialog.ui" line="14"/>
<source>ClickToFlash Whitelist</source>
<translation>Белый список ClickToFlash</translation>
</message>
@@ -4801,7 +4801,7 @@
<translation>Домен:</translation>
</message>
<message>
- <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/>
+ <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/>
<source><no cookie selected></source>
<translation><куки не выбраны></translation>
</message>
@@ -7535,7 +7535,7 @@
<context>
<name>DownloadManager</name>
<message>
- <location filename="../WebBrowser/Download/DownloadManager.py" line="363"/>
+ <location filename="../WebBrowser/Download/DownloadManager.ui" line="14"/>
<source>Downloads</source>
<translation>Загрузки</translation>
</message>
@@ -7999,92 +7999,92 @@
<translation>Стандартные кнопки</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="41"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="257"/>
<source>Abort</source>
<translation>Прервать</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="42"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="264"/>
<source>Apply</source>
<translation>Применить</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="43"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="271"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="44"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="278"/>
<source>Close</source>
<translation>Закрыть</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="45"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="285"/>
<source>Discard</source>
<translation>Сбросить</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="46"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="292"/>
<source>Help</source>
<translation>Справка</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="47"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="299"/>
<source>Ignore</source>
<translation>Игнорировать</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="48"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="306"/>
<source>No</source>
<translation>Нет</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="49"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="313"/>
<source>No to all</source>
<translation>Нет для всех</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="50"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="320"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="51"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="327"/>
<source>Open</source>
<translation>Открыть</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="52"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="334"/>
<source>Reset</source>
<translation>Сбросить</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="53"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="341"/>
<source>Restore defaults</source>
<translation>Восстановить умолчания</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="54"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="348"/>
<source>Retry</source>
<translation>Повтор</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="55"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="355"/>
<source>Save</source>
<translation>Сохранить</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="56"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="362"/>
<source>Save all</source>
<translation>Сохранить всё</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="57"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="369"/>
<source>Yes</source>
<translation>Да</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.py" line="58"/>
+ <location filename="../Plugins/WizardPlugins/E5MessageBoxWizard/E5MessageBoxWizardDialog.ui" line="376"/>
<source>Yes to all</source>
<translation>Да для всех</translation>
</message>
@@ -10103,7 +10103,7 @@
<translation>Выбор API-файла из списка установленных файлов</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="184"/>
+ <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="132"/>
<source>Add from installed APIs</source>
<translation>Добавить из списка установленных файлов API</translation>
</message>
@@ -10113,7 +10113,7 @@
<translation>Выбор API-файла из списка API-файлов установленных плагинов</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="203"/>
+ <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="142"/>
<source>Add from Plugin APIs</source>
<translation>Добавить из списка файлов API, установленных с помощью плагинов</translation>
</message>
@@ -10123,7 +10123,7 @@
<translation>Компиляция выбранных определений API</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="236"/>
+ <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="159"/>
<source>Compile APIs</source>
<translation>Компилировать API</translation>
</message>
@@ -11168,7 +11168,7 @@
<translation>Выберите шрифт.</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="69"/>
+ <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="103"/>
<source>Font</source>
<translation>Шрифт</translation>
</message>
@@ -11178,7 +11178,7 @@
<translation>Разрешить заливку фона до конца строки.</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="353"/>
+ <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="113"/>
<source>Fill to end of line</source>
<translation>Заливка до конца строки</translation>
</message>
@@ -12700,7 +12700,7 @@
<translation>Режим:</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/EditorStylesPage.py" line="58"/>
+ <location filename="../Preferences/ConfigurationPages/EditorStylesPage.ui" line="1080"/>
<source>Disabled</source>
<translation>Отключена</translation>
</message>
@@ -13409,7 +13409,7 @@
<context>
<name>EmailDialog</name>
<message>
- <location filename="../UI/EmailDialog.py" line="339"/>
+ <location filename="../UI/EmailDialog.ui" line="13"/>
<source>Send bug report</source>
<translation>Отправить сообщение об ошибке</translation>
</message>
@@ -14814,12 +14814,12 @@
<translation>Уведомления</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="110"/>
+ <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="122"/>
<source>Host</source>
<translation>Хост</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="111"/>
+ <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="127"/>
<source>Permission</source>
<translation>Разрешение</translation>
</message>
@@ -14834,7 +14834,7 @@
<translation>Удалить все</translation>
</message>
<message>
- <location filename="../WebBrowser/FeaturePermissions/FeaturePermissionsDialog.py" line="51"/>
+ <location filename="../Helpviewer/FeaturePermissions/FeaturePermissionsDialog.ui" line="97"/>
<source>Geolocation</source>
<translation>Геолокация</translation>
</message>
@@ -15961,7 +15961,7 @@
<translation>Имя:</translation>
</message>
<message>
- <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/>
+ <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/>
<source><no flash cookie selected></source>
<translation><нет выделенных флэш-куки></translation>
</message>
@@ -15971,7 +15971,7 @@
<translation>Размер:</translation>
</message>
<message>
- <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="122"/>
+ <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="137"/>
<source>Origin:</source>
<translation>Источник:</translation>
</message>
@@ -16006,7 +16006,7 @@
<translation>Удалить выбранные флэш-куки</translation>
</message>
<message>
- <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="213"/>
+ <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="225"/>
<source>Remove Cookie</source>
<translation>Удалить куки</translation>
</message>
@@ -16435,7 +16435,7 @@
<context>
<name>GreaseMonkeyAddScriptDialog</name>
<message>
- <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.py" line="105"/>
+ <location filename="../WebBrowser/GreaseMonkey/GreaseMonkeyAddScriptDialog.ui" line="14"/>
<source>GreaseMonkey Script Installation</source>
<translation>Инсталляция GreaseMonkey скрипта</translation>
</message>
@@ -22043,7 +22043,7 @@
<context>
<name>HgAddSubrepositoryDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.py" line="98"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgAddSubrepositoryDialog.ui" line="14"/>
<source>Add Sub-repository</source>
<translation>Добавить субрепозиторий</translation>
</message>
@@ -23134,7 +23134,7 @@
<translation>Пометить выбранные конфликты как 'разрешенные'</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="246"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="73"/>
<source>Resolved</source>
<translation>Разрешённые</translation>
</message>
@@ -23144,7 +23144,7 @@
<translation>Пометить выбранные конфликты как 'неразрешенные'</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py" line="244"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.ui" line="83"/>
<source>Unresolved</source>
<translation>Неразрешённые</translation>
</message>
@@ -23737,7 +23737,7 @@
<translation>Задайте поле, по которому фильтровать</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.py" line="317"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/GpgExtension/HgGpgSignaturesDialog.ui" line="55"/>
<source>Revision</source>
<translation>Ревизия</translation>
</message>
@@ -24017,7 +24017,7 @@
<context>
<name>HgLogBrowserDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="71"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="14"/>
<source>Mercurial Log</source>
<translation>Mercurial: Журнал</translation>
</message>
@@ -24057,17 +24057,17 @@
<translation>Задайте поле, по которому фильтровать</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="96"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="181"/>
<source>Revision</source>
<translation>Ревизия</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="191"/>
<source>Author</source>
<translation>Автор</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="201"/>
<source>Message</source>
<translation>Сообщение</translation>
</message>
@@ -24232,27 +24232,27 @@
<translation>Все</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="634"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="641"/>
<source>The hg process did not finish within 30s.</source>
<translation>Процесс hg не завершился в течение 30 секунд.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="637"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="644"/>
<source>Could not start the hg executable.</source>
<translation>Невозможно запустить исполняемый файл hg.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="640"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="647"/>
<source>Mercurial Error</source>
<translation> Mercurial: Ошибка</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="861"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="868"/>
<source>Process Generation Error</source>
<translation>Ошибка при запуске процесса</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="861"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="868"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation>
</message>
@@ -24304,12 +24304,12 @@
<translation>Изменить фазу</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1671"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1692"/>
<source>Copy Changesets</source>
<translation>Копировать набор изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1708"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1729"/>
<source>The project should be reread. Do this now?</source>
<translation>Проект должен быть перепрочитан. Сделать это сейчас?</translation>
</message>
@@ -24344,7 +24344,7 @@
<translation>Помеченная ревизия</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1708"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1729"/>
<source>Switch</source>
<translation>Переключиться</translation>
</message>
@@ -24364,7 +24364,7 @@
<translation>Затягивать (загружать) большие файлы для выбранных ревизий</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="951"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="958"/>
<source>{0} (large file)</source>
<translation>{0} большой файл</translation>
</message>
@@ -24414,12 +24414,12 @@
<translation><tr><td><b>Закладки</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1852"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1891"/>
<source>Find Commit</source>
<translation>Поиск фиксации</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1852"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="1891"/>
<source>'{0}' was not found.</source>
<translation>'{0}' не найдено.</translation>
</message>
@@ -24454,25 +24454,35 @@
<translation>Затягивание (загрузка) изменений из удалённого репозитория</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="221"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/>
<source>Push Selected Changes</source>
<translation>Протолкнуть выбранные изменения</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="223"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="225"/>
<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="226"/>
- <source>Push All Changes</source>
- <translation>Протолкнуть все изменения</translation>
- </message>
- <message>
<location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="228"/>
+ <source>Push All Changes</source>
+ <translation>Протолкнуть все изменения</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="230"/>
<source>Push all changes to a remote repository</source>
<translation>Проталкивание (передача) всех изменений в удаленный репозиторий</translation>
</message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="218"/>
+ <source>Fetch Changes</source>
+ <translation type="unfinished">Получение изменений</translation>
+ </message>
+ <message>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="235"/>
+ <source>Strip Changesets</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>HgLogDialog</name>
@@ -27915,7 +27925,7 @@
<context>
<name>HgStatusDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="313"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="14"/>
<source>Mercurial Status</source>
<translation>Mercurial: Статус </translation>
</message>
@@ -28057,7 +28067,7 @@
<translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="708"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="87"/>
<source>Commit</source>
<translation>Фиксация</translation>
</message>
@@ -28177,7 +28187,7 @@
<translation>все</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py" line="854"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.ui" line="203"/>
<source>Differences</source>
<translation>Различия</translation>
</message>
@@ -29402,7 +29412,7 @@
<translation>Удалить выбранные записи</translation>
</message>
<message>
- <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/>
+ <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/>
<source>&Remove</source>
<translation>&Удалить</translation>
</message>
@@ -35272,92 +35282,92 @@
<translation>Стандартные кнопки</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="40"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="219"/>
<source>Apply</source>
<translation>Применить</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="39"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="226"/>
<source>Abort</source>
<translation>Прервать</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="41"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="233"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="45"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="240"/>
<source>Ignore</source>
<translation>Игнорировать</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="54"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="247"/>
<source>Save all</source>
<translation>Сохранить всё</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="53"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="254"/>
<source>Save</source>
<translation>Сохранить</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="43"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="261"/>
<source>Discard</source>
<translation>Сбросить</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="56"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="268"/>
<source>Yes to all</source>
<translation>Да для всех</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="49"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="275"/>
<source>Open</source>
<translation>Открыть</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="50"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="282"/>
<source>Reset</source>
<translation>Сбросить</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="48"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="289"/>
<source>Ok</source>
<translation>Ok</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="46"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="296"/>
<source>No</source>
<translation>Нет</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="44"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="303"/>
<source>Help</source>
<translation>Справка</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="47"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="310"/>
<source>No to all</source>
<translation>Нет для всех</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="52"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="317"/>
<source>Retry</source>
<translation>Повтор</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="51"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="324"/>
<source>Restore defaults</source>
<translation>Восстановить умолчания</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="55"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="331"/>
<source>Yes</source>
<translation>Да</translation>
</message>
<message>
- <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.py" line="42"/>
+ <location filename="../Plugins/WizardPlugins/MessageBoxWizard/MessageBoxWizardDialog.ui" line="338"/>
<source>Close</source>
<translation>Закрыть</translation>
</message>
@@ -37059,7 +37069,7 @@
<context>
<name>NoCacheHostsDialog</name>
<message>
- <location filename="../Helpviewer/Network/NoCacheHostsDialog.py" line="52"/>
+ <location filename="../Helpviewer/Network/NoCacheHostsDialog.ui" line="14"/>
<source>Not Cached Hosts</source>
<translation>Некэшированные хосты</translation>
</message>
@@ -37167,7 +37177,7 @@
<translation>Задать координаты визуально</translation>
</message>
<message>
- <location filename="../Preferences/ConfigurationPages/NotificationsPage.py" line="81"/>
+ <location filename="../Preferences/ConfigurationPages/NotificationsPage.ui" line="146"/>
<source>Visual Selection</source>
<translation>Визуальный выбор</translation>
</message>
@@ -37840,7 +37850,7 @@
<context>
<name>PasswordsDialog</name>
<message>
- <location filename="../WebBrowser/Passwords/PasswordsDialog.py" line="91"/>
+ <location filename="../WebBrowser/Passwords/PasswordsDialog.ui" line="14"/>
<source>Saved Passwords</source>
<translation>Сохранённые пароли</translation>
</message>
@@ -42658,7 +42668,7 @@
<translation>Выполнено</translation>
</message>
<message>
- <location filename="../DataViews/PyCoverageDialog.py" line="349"/>
+ <location filename="../DataViews/PyCoverageDialog.ui" line="172"/>
<source>Coverage</source>
<translation>Охват</translation>
</message>
@@ -42739,7 +42749,7 @@
</translation>
</message>
<message>
- <location filename="../DataViews/PyCoverageDialog.py" line="345"/>
+ <location filename="../DataViews/PyCoverageDialog.ui" line="192"/>
<source>%v/%m Files</source>
<translation>%v из %m файлов</translation>
</message>
@@ -42747,7 +42757,7 @@
<context>
<name>PyProfileDialog</name>
<message>
- <location filename="../DataViews/PyProfileDialog.py" line="233"/>
+ <location filename="../DataViews/PyProfileDialog.ui" line="20"/>
<source>Profile Results</source>
<translation>Результаты профайлера</translation>
</message>
@@ -47479,7 +47489,7 @@
<translation>Удалить выделенные фильтры</translation>
</message>
<message>
- <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="150"/>
+ <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="89"/>
<source>Remove Filters</source>
<translation>Удалить фильтры</translation>
</message>
@@ -47489,7 +47499,7 @@
<translation>Удалить выбранные атрибуты</translation>
</message>
<message>
- <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.py" line="178"/>
+ <location filename="../WebBrowser/QtHelp/QtHelpFiltersDialog.ui" line="99"/>
<source>Remove Attributes</source>
<translation>Удалить атрибуты</translation>
</message>
@@ -49004,7 +49014,7 @@
<context>
<name>SendRefererWhitelistDialog</name>
<message>
- <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.py" line="52"/>
+ <location filename="../WebBrowser/Network/SendRefererWhitelistDialog.ui" line="14"/>
<source>Send Referer Whitelist</source>
<translation>Отправить реферер белого списка</translation>
</message>
@@ -50219,7 +50229,7 @@
<translation>К&опировать превью</translation>
</message>
<message>
- <location filename="../Snapshot/SnapWidget.py" line="531"/>
+ <location filename="../Snapshot/SnapWidget.ui" line="20"/>
<source>eric6 Snapshot</source>
<translation>Снимки eric6</translation>
</message>
@@ -51665,7 +51675,7 @@
<context>
<name>Strip</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py" line="68"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py" line="73"/>
<source>Stripping changesets from repository</source>
<translation type="unfinished"></translation>
</message>
@@ -51683,12 +51693,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="83"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="85"/>
<source>Strip</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="83"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/StripExtension/ProjectHelper.py" line="85"/>
<source>The project should be reread. Do this now?</source>
<translation type="unfinished">Проект должен быть перепрочитан. Сделать это сейчас?</translation>
</message>
@@ -52739,7 +52749,7 @@
<context>
<name>SvnDiffDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsPySvn/SvnDiffDialog.py" line="171"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.ui" line="14"/>
<source>Subversion Diff</source>
<translation>Subversion: Отображение различий</translation>
</message>
@@ -53042,17 +53052,17 @@
<translation>Выберите поле, по которому фильтровать</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="621"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="112"/>
<source>Revision</source>
<translation>Ревизия</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="618"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="117"/>
<source>Author</source>
<translation>Автор</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py" line="141"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.ui" line="127"/>
<source>Message</source>
<translation>Сообщение</translation>
</message>
@@ -53515,7 +53525,7 @@
<translation><b>URL</b><p>Задайте URL модуля. Репозиторий со стандартной раскладкой не должен содержать части trunk, tags или branches.</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/>
<source>&URL:</source>
<translation>&URL репозитория:</translation>
</message>
@@ -53610,7 +53620,7 @@
<translation>Задайте протокол доступа к репозиторию</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/>
<source>&URL:</source>
<translation>&URL репозитория:</translation>
</message>
@@ -54820,7 +54830,7 @@
<context>
<name>SvnStatusDialog</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="394"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="14"/>
<source>Subversion Status</source>
<translation>Subversion: Статус</translation>
</message>
@@ -55097,7 +55107,7 @@
<translation>Невозможно запустить процесс {0}. Убедитесь, что он находится в путях поиска.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py" line="711"/>
+ <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.ui" line="80"/>
<source>Commit</source>
<translation>Фиксация</translation>
</message>
@@ -60329,7 +60339,7 @@
<context>
<name>UnittestDialog</name>
<message>
- <location filename="../PyUnit/UnittestDialog.py" line="400"/>
+ <location filename="../PyUnit/UnittestDialog.ui" line="14"/>
<source>Unittest</source>
<translation>Unittest</translation>
</message>
@@ -62979,167 +62989,167 @@
<context>
<name>Variable Types</name>
<message>
- <location filename="../Debugger/Config.py" line="17"/>
+ <location filename="../Debugger/Config.py" line="16"/>
<source>Hidden Attributes</source>
<translation>Скрытые атрибуты</translation>
</message>
<message>
+ <location filename="../Debugger/Config.py" line="17"/>
+ <source>None</source>
+ <translation>None</translation>
+ </message>
+ <message>
<location filename="../Debugger/Config.py" line="18"/>
- <source>None</source>
- <translation>None</translation>
+ <source>Type</source>
+ <translation>Тип</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="19"/>
- <source>Type</source>
- <translation>Тип</translation>
+ <source>Boolean</source>
+ <translation>Логический</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="20"/>
- <source>Boolean</source>
- <translation>Логический</translation>
+ <source>Integer</source>
+ <translation>Целое</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="21"/>
- <source>Integer</source>
- <translation>Целое</translation>
+ <source>Long Integer</source>
+ <translation>Длинное целое</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="22"/>
- <source>Long Integer</source>
- <translation>Длинное целое</translation>
+ <source>Float</source>
+ <translation>Дробное</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="23"/>
- <source>Float</source>
- <translation>Дробное</translation>
+ <source>Complex</source>
+ <translation>Комплексное</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="24"/>
- <source>Complex</source>
- <translation>Комплексное</translation>
+ <source>String</source>
+ <translation>Строка</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="25"/>
- <source>String</source>
- <translation>Строка</translation>
+ <source>Unicode String</source>
+ <translation>Строка Unicode</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="26"/>
- <source>Unicode String</source>
- <translation>Строка Unicode</translation>
+ <source>Tuple</source>
+ <translation>Кортеж</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="27"/>
- <source>Tuple</source>
- <translation>Кортеж</translation>
+ <source>List/Array</source>
+ <translation>Список/массив</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="28"/>
- <source>List/Array</source>
- <translation>Список/массив</translation>
+ <source>Dictionary/Hash/Map</source>
+ <translation>Словарь/хеш/ассоц. массив</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="29"/>
- <source>Dictionary/Hash/Map</source>
- <translation>Словарь/хеш/ассоц. массив</translation>
+ <source>Dictionary Proxy</source>
+ <translation>Прокси словаря</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="30"/>
- <source>Dictionary Proxy</source>
- <translation>Прокси словаря</translation>
- </message>
- <message>
- <location filename="../Debugger/Config.py" line="31"/>
<source>Set</source>
<translation>Набор</translation>
</message>
<message>
+ <location filename="../Debugger/Config.py" line="32"/>
+ <source>File</source>
+ <translation>Файл</translation>
+ </message>
+ <message>
<location filename="../Debugger/Config.py" line="33"/>
- <source>File</source>
- <translation>Файл</translation>
+ <source>X Range</source>
+ <translation>Интервал</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="34"/>
- <source>X Range</source>
- <translation>Интервал</translation>
+ <source>Slice</source>
+ <translation>Срез</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="35"/>
- <source>Slice</source>
- <translation>Срез</translation>
+ <source>Buffer</source>
+ <translation>Буфер</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="36"/>
- <source>Buffer</source>
- <translation>Буфер</translation>
+ <source>Class</source>
+ <translation>Класс</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="37"/>
- <source>Class</source>
- <translation>Класс</translation>
+ <source>Class Instance</source>
+ <translation>Экземпляр класса</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="38"/>
- <source>Class Instance</source>
- <translation>Экземпляр класса</translation>
+ <source>Class Method</source>
+ <translation>Метод класса</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="39"/>
- <source>Class Method</source>
- <translation>Метод класса</translation>
+ <source>Class Property</source>
+ <translation>Свойство класса</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="40"/>
- <source>Class Property</source>
- <translation>Свойство класса</translation>
+ <source>Generator</source>
+ <translation>Генератор</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="41"/>
- <source>Generator</source>
- <translation>Генератор</translation>
- </message>
- <message>
- <location filename="../Debugger/Config.py" line="42"/>
<source>Function</source>
<translation>Функция</translation>
</message>
<message>
+ <location filename="../Debugger/Config.py" line="43"/>
+ <source>Builtin Function</source>
+ <translation>Встроенная функция</translation>
+ </message>
+ <message>
<location filename="../Debugger/Config.py" line="44"/>
- <source>Builtin Function</source>
- <translation>Встроенная функция</translation>
+ <source>Code</source>
+ <translation>Код</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="45"/>
- <source>Code</source>
- <translation>Код</translation>
+ <source>Module</source>
+ <translation>Модуль</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="46"/>
- <source>Module</source>
- <translation>Модуль</translation>
+ <source>Ellipsis</source>
+ <translation>Многоточие</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="47"/>
- <source>Ellipsis</source>
- <translation>Многоточие</translation>
+ <source>Traceback</source>
+ <translation>Обратная трассировка</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="48"/>
- <source>Traceback</source>
- <translation>Обратная трассировка</translation>
+ <source>Frame</source>
+ <translation>Кадр стека</translation>
</message>
<message>
<location filename="../Debugger/Config.py" line="49"/>
- <source>Frame</source>
- <translation>Кадр стека</translation>
- </message>
- <message>
- <location filename="../Debugger/Config.py" line="50"/>
<source>Other</source>
<translation>Другое</translation>
</message>
<message>
- <location filename="../Debugger/Config.py" line="32"/>
+ <location filename="../Debugger/Config.py" line="31"/>
<source>Frozen Set</source>
<translation>Frozen Set</translation>
</message>
