--- a/i18n/eric6_ru.ts Fri Oct 21 23:14:16 2016 +0200 +++ b/i18n/eric6_ru.ts Sat Oct 22 17:09:08 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> @@ -21705,107 +21705,107 @@ <translation>Отображение текущей ветви</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2411"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2412"/> <source>Verifying the integrity of the Mercurial repository</source> <translation>Mercurial: Проверка целостности репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2436"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2437"/> <source>Showing the combined configuration settings</source> <translation>Отображение обобщенных параметров конфигурации</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2460"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2461"/> <source>Showing aliases for remote repositories</source> <translation>Отображение алиасов удалённых репозиториев</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2484"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2485"/> <source>Recovering from interrupted transaction</source> <translation>Восстановление после прерванной транзакции</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2508"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2509"/> <source>Identifying project directory</source> <translation>Идентификация директории проекта</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2547"/> <source>Create .hgignore file</source> <translation>Создать файл .hgignore</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2546"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2547"/> <source><p>The file <b>{0}</b> exists already. Overwrite it?</p></source> <translation><p>Файл <b>{0}</b> уже существует. Перезаписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2637"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/> <source>Create changegroup</source> <translation>Создать группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2594"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2595"/> <source>Mercurial Changegroup Files (*.hg)</source> <translation>Файлы группы изменений Mercurial (*.hg)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2611"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2612"/> <source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source> <translation><p>Файл группы изменений Mercurial<b>{0}</b> уже существует. Переписать?</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2658"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2659"/> <source>Preview changegroup</source> <translation>Просмотр группы изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2698"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/> <source>Mercurial Changegroup Files (*.hg);;All Files (*)</source> <translation>Файлы группы изменений Mercurial (*.hg);;Все файлы (*)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2718"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2719"/> <source>Apply changegroups</source> <translation>Применить группу изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2706"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2707"/> <source>Shall the working directory be updated?</source> <translation>Обновить рабочую директорию?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2736"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/> <source>Bisect subcommand ({0}) invalid.</source> <translation>Неправильная Bisect подкоманда ({0}).</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2766"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2767"/> <source>Mercurial Bisect ({0})</source> <translation>Mercurial: Bisect ({0})</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2798"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2799"/> <source>Removing files from the Mercurial repository only</source> <translation>Mercurial: Удаление файлов только из репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2852"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853"/> <source>Backing out changeset</source> <translation>Отмена набора изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2832"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/> <source>No revision given. Aborting...</source> <translation>Не задана ревизия. Отмена...</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2879"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2880"/> <source>Rollback last transaction</source> <translation>Откатить последнюю транзакцию</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2872"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2873"/> <source>Are you sure you want to rollback the last transaction?</source> <translation>Вы действительно хотите откатить последнюю транзакцию?</translation> </message> @@ -21815,72 +21815,72 @@ <translation>Mercurial: Фиксация изменений в репозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3514"/> <source>Mercurial Command Server</source> <translation>Mercurial: Сервер команд</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3368"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3369"/> <source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source> <translation><p>Mercurial: Невозможно перезапустить сервер.<br>Причина: {0}.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3513"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3514"/> <source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source> <translation><p>Mercurial: Невозможно запустить сервер.<br>Причина: {0}.</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2947"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2948"/> <source>Import Patch</source> <translation>Импорт патча</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2994"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/> <source>Export Patches</source> <translation>Экспорт патчей</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3041"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3042"/> <source>Change Phase</source> <translation>Изменить фазу</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3094"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3095"/> <source>Copy Changesets</source> <translation>Копировать набор изменений</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3120"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3121"/> <source>Copy Changesets (Continue)</source> <translation>Копировать набор изменений (продолжение)</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3238"/> <source>Add Sub-repository</source> <translation>Добавить субрепозиторий</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3271"/> <source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source> <translation><p>Невозможно прочитать файл субрепозиториев .hgsub.<b></b>Причина {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3219"/> <source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source> <translation><p>Файл субрепозиториев .hgsub уже содержит запись <b>{0}</b>. Отмена...</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3290"/> <source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source> <translation><p>Невозможно записать файл субрепозиториев .hgsub.<p><p>Причина: {0}</p></translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3289"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3290"/> <source>Remove Sub-repositories</source> <translation>Удалить субрепозитории</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3258"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3259"/> <source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source> <translation><p>Отсутствует файл субрепозиториев .hgsub. Отмена...</p></translation> </message> @@ -21910,7 +21910,7 @@ <translation>Вы действительно хотите откатить все изменения в проекте?</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3155"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3156"/> <source>Create Unversioned Archive</source> <translation>Создать неверсированный архив</translation> </message> @@ -21950,62 +21950,62 @@ <translation>Отмена незавершённого слияния</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3623"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3624"/> <source>Mercurial Bookmark</source> <translation>Mercurial: Закладка</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Delete Bookmark</source> <translation>Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3641"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3642"/> <source>Select the bookmark to be deleted:</source> <translation>Выберите закладку для удаления:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3652"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3653"/> <source>Delete Mercurial Bookmark</source> <translation>Mercurial: Удалить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3680"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3681"/> <source>Rename Mercurial Bookmark</source> <translation>Mercurial: Переименовать закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3713"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3714"/> <source>Move Mercurial Bookmark</source> <translation>Mercurial: Переместить закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3805"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3806"/> <source>Pull Bookmark</source> <translation>Затянуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3805"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3806"/> <source>Select the bookmark to be pulled:</source> <translation>Выберите закладку для затягивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3816"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3817"/> <source>Pulling bookmark from a remote Mercurial repository</source> <translation>Mercurial: Загрузка закладки из удалённого репозитория</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Push Bookmark</source> <translation>Протолкнуть закладку</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3845"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3846"/> <source>Select the bookmark to be push:</source> <translation>Выберите закладку для проталкивания:</translation> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3856"/> + <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3857"/> <source>Pushing bookmark to a remote Mercurial repository</source> <translation>Mercurial: Проталкивание (передача) закладки в удалённый репозиторий</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> @@ -27915,7 +27915,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 +28057,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 +28177,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> @@ -28792,142 +28792,473 @@ <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="14"/> <source>Mercurial User Data</source> - <translation>Mercurial: Данные пользователя</translation> + <translation type="obsolete">Mercurial: Данные пользователя</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="23"/> <source>User Data</source> - <translation>Данные пользователя</translation> + <translation type="obsolete">Данные пользователя</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="29"/> <source>First Name:</source> - <translation>Имя:</translation> + <translation type="obsolete">Имя:</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="36"/> <source>Enter the first name</source> - <translation>Введите имя пользователя</translation> + <translation type="obsolete">Введите имя пользователя</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="43"/> <source>Last Name:</source> - <translation>Фамилия:</translation> + <translation type="obsolete">Фамилия:</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="50"/> <source>Enter the last name</source> - <translation>Введите фамилию пользователя</translation> + <translation type="obsolete">Введите фамилию пользователя</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="57"/> <source>Email:</source> - <translation>Email:</translation> + <translation type="obsolete">Email:</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="64"/> <source>Enter the email address</source> - <translation>Задайте адрес электронной почты</translation> + <translation type="obsolete">Задайте адрес электронной почты</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="74"/> <source>Extensions</source> - <translation>Плагины (расширения)</translation> + <translation type="obsolete">Плагины (расширения)</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="80"/> <source>Select to activate the fetch extension</source> - <translation>Активировать плагин fetch</translation> + <translation type="obsolete">Активировать плагин fetch</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="83"/> <source>Fetch</source> - <translation>Fetch</translation> + <translation type="obsolete">Fetch</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="90"/> <source>Select to activate the GPG extension</source> - <translation>Активировать плагин GPG</translation> + <translation type="obsolete">Активировать плагин GPG</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="93"/> <source>GPG</source> - <translation>GPG</translation> + <translation type="obsolete">GPG</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="110"/> <source>Select to activate the Purge extension</source> - <translation>Активировать плагин Purge</translation> + <translation type="obsolete">Активировать плагин Purge</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="113"/> <source>Purge</source> - <translation>Purge</translation> + <translation type="obsolete">Purge</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="120"/> <source>Select to activate the queues extension</source> - <translation>Активировать плагин Queues</translation> + <translation type="obsolete">Активировать плагин Queues</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="123"/> <source>Queues</source> - <translation>Queues</translation> + <translation type="obsolete">Queues</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="133"/> <source>Rebase</source> - <translation>Rebase</translation> + <translation type="obsolete">Rebase</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="130"/> <source>Select to activate the rebase extension</source> - <translation>Активировать плагин Rebase</translation> + <translation type="obsolete">Активировать плагин Rebase</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="140"/> <source>Select to activate the shelve extension</source> - <translation>Активировать плагин Shelve</translation> + <translation type="obsolete">Активировать плагин Shelve</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="143"/> <source>Shelve</source> - <translation>Shelve</translation> + <translation type="obsolete">Shelve</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="100"/> <source>Select to activate the largefiles extension</source> - <translation>Активировать плагин LargeFiles</translation> + <translation type="obsolete">Активировать плагин LargeFiles</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="156"/> <source>Large Files</source> - <translation>Large Files</translation> + <translation type="obsolete">Large Files</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="162"/> <source>Minimum file size:</source> - <translation>Минимальный размер файла:</translation> + <translation type="obsolete">Минимальный размер файла:</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="169"/> <source>Enter the minimum file size in MB for files to be treated as Large Files</source> - <translation>Задайте минимальный размер файла в MB для файлов, которые будут считаться большими</translation> + <translation type="obsolete">Задайте минимальный размер файла в MB для файлов, которые будут считаться большими</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="175"/> <source> MB</source> - <translation> MB</translation> + <translation type="obsolete"> MB</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="201"/> <source>Patterns:</source> - <translation>Шаблоны имен файлов:</translation> + <translation type="obsolete">Шаблоны имен файлов:</translation> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDataDialog.ui" line="208"/> <source>Enter file patterns (space separated) for files to be treated as Large Files</source> - <translation>Задайте разделенные пробелами шаблоны файлов, которые будут считаться большими</translation> + <translation type="obsolete">Задайте разделенные пробелами шаблоны файлов, которые будут считаться большими</translation> + </message> +</context> +<context> + <name>HgUserConfigDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="349"/> + <source>Delete Host Fingerprint</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="349"/> + <source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="404"/> + <source>Edit User Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="404"/> + <source>You will loose all changes made in this dialog. Shall the data be saved first?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="14"/> + <source>Mercurial User Data</source> + <translation type="unfinished">Mercurial: Данные пользователя</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="27"/> + <source>User</source> + <translation type="unfinished">Пользователь</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="45"/> + <source>User Data</source> + <translation type="unfinished">Данные пользователя</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="51"/> + <source>Name:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="58"/> + <source>Enter the user name</source> + <translation type="unfinished">Введите имя пользователя</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="61"/> + <source>Enter your name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="68"/> + <source>Email:</source> + <translation type="unfinished">Email:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="75"/> + <source>Enter the email address</source> + <translation type="unfinished">Задайте адрес электронной почты</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="78"/> + <source>Enter your email address</source> + <translation type="unfinished">Задайте адрес вашей электронной почты</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="120"/> + <source>Extensions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="126"/> + <source>Select to activate the fetch extension</source> + <translation type="unfinished">Активировать плагин fetch</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="129"/> + <source>Fetch</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="136"/> + <source>Select to activate the GPG extension</source> + <translation type="unfinished">Активировать плагин GPG</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="139"/> + <source>GPG</source> + <translation type="unfinished">GPG</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="146"/> + <source>Select to activate the largefiles extension</source> + <translation type="unfinished">Активировать плагин LargeFiles</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="202"/> + <source>Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="156"/> + <source>Select to activate the Purge extension</source> + <translation type="unfinished">Активировать плагин Purge</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="159"/> + <source>Purge</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="166"/> + <source>Select to activate the queues extension</source> + <translation type="unfinished">Активировать плагин Queues</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="169"/> + <source>Queues</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="176"/> + <source>Select to activate the rebase extension</source> + <translation type="unfinished">Активировать плагин Rebase</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="179"/> + <source>Rebase</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="186"/> + <source>Select to activate the shelve extension</source> + <translation type="unfinished">Активировать плагин Shelve</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="189"/> + <source>Shelve</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="208"/> + <source>Minimum file size:</source> + <translation type="unfinished">Минимальный размер файла:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="215"/> + <source>Enter the minimum file size in MB for files to be treated as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="221"/> + <source> MB</source> + <translation type="unfinished"> MB</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="247"/> + <source>Patterns:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="254"/> + <source>Enter file patterns (space separated) for files to be treated as Large Files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="257"/> + <source>Enter file patterns for large files</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="264"/> + <source>User Cache:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="280"/> + <source>Enter the name of the user cache directory</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="304"/> + <source>Network</source> + <translation type="unfinished">Сеть</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="322"/> + <source>Proxy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="328"/> + <source>Host:</source> + <translation type="unfinished">Хост:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="335"/> + <source>Enter the network proxy host name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="338"/> + <source>Enter Proxy Hostname</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="345"/> + <source>User:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="352"/> + <source>Enter the user name for the network proxy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="355"/> + <source>Enter Proxy Username</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="362"/> + <source>Password:</source> + <translation type="unfinished">Пароль:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="369"/> + <source>Enter the password for the network proxy</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="375"/> + <source>Enter Proxy Password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="382"/> + <source>Bypass:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="389"/> + <source>Enter the names of hosts bypassing the network proxy sparated by comma</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="395"/> + <source>Enter hosts bypassing the proxy separated by comma</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="405"/> + <source>Host Fingerprints</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="424"/> + <source>Host</source> + <translation type="unfinished">Хост</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="429"/> + <source>Fingerprint</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="439"/> + <source>Add a host fingerprint entry</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="446"/> + <source>Delete a host fingerprint entry</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="453"/> + <source>Edit a host fingerprint entry</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="482"/> + <source>Open the user configuration file in a text editor</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="485"/> + <source>Open configuration file in editor</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>HgUserConfigHostFingerprintDialog</name> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="14"/> + <source>Host Fingerprint</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="23"/> + <source>Host:</source> + <translation type="unfinished">Хост:</translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="30"/> + <source>Enter the host name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="33"/> + <source>Enter Hostname</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="40"/> + <source>Fingerprint:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="47"/> + <source>Enter the host fingerprint</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigHostFingerprintDialog.ui" line="50"/> + <source>Enter Fingerprint</source> + <translation type="unfinished"></translation> </message> </context> <context> @@ -28948,7 +29279,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> @@ -34818,92 +35149,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> @@ -36605,7 +36936,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> @@ -36713,7 +37044,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> @@ -37386,7 +37717,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> @@ -42204,7 +42535,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> @@ -42285,7 +42616,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> @@ -42293,7 +42624,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> @@ -47025,7 +47356,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> @@ -47035,7 +47366,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> @@ -48550,7 +48881,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> @@ -49765,7 +50096,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> @@ -52249,7 +52580,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> @@ -52552,17 +52883,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> @@ -53025,7 +53356,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> @@ -53120,7 +53451,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> @@ -54330,7 +54661,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> @@ -54607,7 +54938,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> @@ -59839,7 +60170,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>