Mercurial Repositories > eric / file diff

--- a/i18n/eric6_ru.ts	Wed Jan 25 11:17:04 2017 +0100
+++ b/i18n/eric6_ru.ts	Wed Jan 25 12:48:42 2017 +0100
@@ -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>
@@ -1700,7 +1700,7 @@
         <translation>Удалить выбранные элементы</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/Bookmarks/BookmarksDialog.py" line="169"/>
+        <location filename="../WebBrowser/Bookmarks/BookmarksDialog.ui" line="75"/>
         <source>&amp;Delete</source>
         <translation>&amp;Удалить</translation>
     </message>
@@ -2423,12 +2423,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>
@@ -2536,7 +2536,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>
@@ -2894,7 +2894,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>
@@ -4826,7 +4826,7 @@
         <translation>Домен:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/CookieJar/CookiesDialog.py" line="177"/>
+        <location filename="../WebBrowser/CookieJar/CookiesDialog.ui" line="223"/>
         <source>&lt;no cookie selected&gt;</source>
         <translation>&lt;куки не выбраны&gt;</translation>
     </message>
@@ -7417,7 +7417,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>
@@ -7881,92 +7881,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>
@@ -9985,7 +9985,7 @@
         <translation>Выбор API-файла  из списка установленных файлов</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="249"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="146"/>
         <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.py" line="268"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="156"/>
         <source>Add from Plugin APIs</source>
         <translation>Добавить из списка файлов API, установленных с помощью плагинов</translation>
     </message>
@@ -10005,7 +10005,7 @@
         <translation>Компиляция выбранных определений API</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.py" line="301"/>
+        <location filename="../Preferences/ConfigurationPages/EditorAPIsPage.ui" line="173"/>
         <source>Compile APIs</source>
         <translation>Компилировать API</translation>
     </message>
@@ -11143,7 +11143,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>
@@ -11153,7 +11153,7 @@
         <translation>Разрешить заливку фона до конца строки.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.py" line="357"/>
+        <location filename="../Preferences/ConfigurationPages/EditorHighlightingStylesPage.ui" line="113"/>
         <source>Fill to end of line</source>
         <translation>Заливка до конца строки</translation>
     </message>
@@ -12695,7 +12695,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>
@@ -13414,7 +13414,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>
@@ -13509,27 +13509,27 @@
         <translation>Вы действительно хотите закрыть диалог?</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="293"/>
+        <location filename="../UI/EmailDialog.py" line="300"/>
         <source>Mail Server Password</source>
         <translation>Пароль к почтовому серверу</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="293"/>
+        <location filename="../UI/EmailDialog.py" line="300"/>
         <source>Enter your mail server password</source>
         <translation>Задайте свой пароль к почтовому серверу</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="311"/>
+        <location filename="../UI/EmailDialog.py" line="318"/>
         <source>&lt;p&gt;Authentication failed.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Аутентификация не удалась по причине: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="339"/>
+        <location filename="../UI/EmailDialog.py" line="346"/>
         <source>&lt;p&gt;Message could not be sent.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Сообщение не может быть отправлено по причине: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../UI/EmailDialog.py" line="357"/>
+        <location filename="../UI/EmailDialog.py" line="364"/>
         <source>Attach file</source>
         <translation>Прицепить файл</translation>
     </message>
@@ -13554,98 +13554,133 @@
     <message>
         <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/>
         <source>Outgoing mail server port:</source>
-        <translation>Номер порта почтового сервера для отсылки сообщений:</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="60"/>
+        <translation type="obsolete">Номер порта почтового сервера для отсылки сообщений:</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="124"/>
         <source>Enter the port of the mail server</source>
         <translation>Введите номер порта на почтовом сервере</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="92"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="156"/>
         <source>Email address:</source>
         <translation>Адрес эл. почты:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="99"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/>
         <source>Enter your email address</source>
         <translation>Задайте адрес вашей электронной почты</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="106"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="170"/>
         <source>Signature:</source>
         <translation>Подпись:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="116"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="180"/>
         <source>Enter your email signature</source>
         <translation>Задайте подпись к Вашему письму</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="128"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="104"/>
         <source>Select to use TLS</source>
         <translation>Использовать TLS</translation>
     </message>
     <message>
         <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="131"/>
         <source>Use TLS</source>
-        <translation>Использовать TLS</translation>
-    </message>
-    <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="138"/>
+        <translation type="obsolete">Использовать TLS</translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="192"/>
         <source>Select to authenticatate against the mail server</source>
         <translation>Включить аутентификацию для почтового сервера</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="141"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="195"/>
         <source>Mail server needs authentication</source>
         <translation>Почтовый сервер требует аутентификацию</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="153"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="204"/>
         <source>Username:</source>
         <translation>Имя пользователя:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="163"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="211"/>
         <source>Enter your mail server username</source>
         <translation>Задайте ваше имя пользователя на почтовом сервере</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="173"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="218"/>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="183"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="225"/>
         <source>Enter your password for accessing the mail server</source>
         <translation>Задайте пароль для доступа к почтовому серверу</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="193"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="235"/>
         <source>Press to test the login data</source>
         <translation>Тест регистрационных данных</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="196"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="238"/>
         <source>Test Login</source>
         <translation>Тест входа</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/>
         <source>Login Test</source>
         <translation>Тест логина</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="138"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="204"/>
         <source>The login test succeeded.</source>
         <translation>Тест логина успешен.</translation>
     </message>
     <message>
-        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="175"/>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.py" line="241"/>
         <source>&lt;p&gt;The login test failed.&lt;br&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Входной тест не пройден.&lt;br&gt; Причина: {0}&lt;/p&gt;</translation>
     </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="53"/>
+        <source>Encryption Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="81"/>
+        <source>Select to use no encryption</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="84"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="94"/>
+        <source>Select to use SSL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="97"/>
+        <source>SSL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="107"/>
+        <source>TLS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Preferences/ConfigurationPages/EmailPage.ui" line="117"/>
+        <source>Port:</source>
+        <translation type="unfinished">Порт:</translation>
+    </message>
 </context>
 <context>
     <name>EricAccessHandler</name>
@@ -14819,12 +14854,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>
@@ -14839,7 +14874,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>
@@ -15966,7 +16001,7 @@
         <translation>Имя:</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py" line="193"/>
+        <location filename="../WebBrowser/FlashCookieManager/FlashCookieManagerDialog.ui" line="158"/>
         <source>&lt;no flash cookie selected&gt;</source>
         <translation>&lt;нет выделенных флэш-куки&gt;</translation>
     </message>
@@ -15976,7 +16011,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>
@@ -16011,7 +16046,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>
@@ -16440,7 +16475,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>
@@ -22048,7 +22083,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>
@@ -23229,7 +23264,7 @@
         <translation>Пометить выбранные конфликты как &apos;разрешенные&apos;</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>
@@ -23239,7 +23274,7 @@
         <translation>Пометить выбранные конфликты как &apos;неразрешенные&apos;</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>
@@ -23832,7 +23867,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>
@@ -24205,7 +24240,7 @@
         <translation>&lt;p&gt;Невозможно прочитать файл &lt;b&gt;{0}&lt;/b&gt;.&lt;/p&gt;&lt;p&gt;Причина: {1}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.py" line="249"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HisteditExtension/HgHisteditPlanEditor.ui" line="14"/>
         <source>Edit Plan</source>
         <translation>Изменение плана</translation>
     </message>
@@ -24346,7 +24381,7 @@
 <context>
     <name>HgLogBrowserDialog</name>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="72"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="14"/>
         <source>Mercurial Log</source>
         <translation>Mercurial: Журнал</translation>
     </message>
@@ -24386,17 +24421,17 @@
         <translation>Задайте поле, по которому фильтровать</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="97"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="181"/>
         <source>Revision</source>
         <translation>Ревизия</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="98"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="191"/>
         <source>Author</source>
         <translation>Автор</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py" line="99"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.ui" line="201"/>
         <source>Message</source>
         <translation>Сообщение</translation>
     </message>
@@ -28324,7 +28359,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>
@@ -28466,7 +28501,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>
@@ -28586,7 +28621,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>
@@ -29862,7 +29897,7 @@
         <translation>Удалить выбранные записи</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/History/HistoryDialog.py" line="114"/>
+        <location filename="../WebBrowser/History/HistoryDialog.ui" line="75"/>
         <source>&amp;Remove</source>
         <translation>&amp;Удалить</translation>
     </message>
@@ -36019,92 +36054,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>
@@ -37816,7 +37851,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>
@@ -37924,7 +37959,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>
@@ -38597,7 +38632,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>
@@ -43390,7 +43425,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>
@@ -43471,7 +43506,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>
@@ -43479,7 +43514,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>
@@ -48276,7 +48311,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>
@@ -48286,7 +48321,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>
@@ -49814,7 +49849,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>
@@ -51029,7 +51064,7 @@
         <translation>К&amp;опировать превью</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>
@@ -53642,7 +53677,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>
@@ -53945,17 +53980,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>
@@ -54418,7 +54453,7 @@
         <translation>&lt;b&gt;URL&lt;/b&gt;&lt;p&gt;Задайте URL модуля. Репозиторий со стандартной раскладкой не должен содержать части trunk, tags или branches.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py" line="128"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.ui" line="45"/>
         <source>&amp;URL:</source>
         <translation>&amp;URL репозитория:</translation>
     </message>
@@ -54513,7 +54548,7 @@
         <translation>Задайте протокол доступа к репозиторию</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py" line="95"/>
+        <location filename="../Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.ui" line="45"/>
         <source>&amp;URL:</source>
         <translation>&amp;URL репозитория:</translation>
     </message>
@@ -55723,7 +55758,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>
@@ -56000,7 +56035,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>
@@ -61232,7 +61267,7 @@
 <context>
     <name>UnittestDialog</name>
     <message>
-        <location filename="../PyUnit/UnittestDialog.py" line="403"/>
+        <location filename="../PyUnit/UnittestDialog.ui" line="14"/>
         <source>Unittest</source>
         <translation>Unittest</translation>
     </message>