--- a/i18n/eric6_ru.ts Sat Jul 05 18:33:48 2014 +0200
+++ b/i18n/eric6_ru.ts Sat Jul 05 18:38:10 2014 +0200
@@ -7889,47 +7889,47 @@
<context>
<name>E5ErrorMessage</name>
<message>
- <location filename="../E5Gui/E5ErrorMessage.py" line="100"/>
+ <location filename="../E5Gui/E5ErrorMessage.py" line="101"/>
<source>Debug Message:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../E5Gui/E5ErrorMessage.py" line="103"/>
+ <location filename="../E5Gui/E5ErrorMessage.py" line="104"/>
<source>Warning:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../E5Gui/E5ErrorMessage.py" line="106"/>
+ <location filename="../E5Gui/E5ErrorMessage.py" line="107"/>
<source>Critical:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../E5Gui/E5ErrorMessage.py" line="109"/>
+ <location filename="../E5Gui/E5ErrorMessage.py" line="110"/>
<source>Fatal Error:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../E5Gui/E5ErrorMessage.py" line="139"/>
+ <location filename="../E5Gui/E5ErrorMessage.py" line="140"/>
<source>Warning</source>
<translation type="unfinished">Предупреждение</translation>
</message>
<message>
- <location filename="../E5Gui/E5ErrorMessage.py" line="142"/>
+ <location filename="../E5Gui/E5ErrorMessage.py" line="143"/>
<source>Critical</source>
<translation type="unfinished">Ошибка</translation>
</message>
<message>
- <location filename="../E5Gui/E5ErrorMessage.py" line="145"/>
+ <location filename="../E5Gui/E5ErrorMessage.py" line="146"/>
<source>Fatal Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../E5Gui/E5ErrorMessage.py" line="136"/>
+ <location filename="../E5Gui/E5ErrorMessage.py" line="137"/>
<source>Debug Message</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../E5Gui/E5ErrorMessage.py" line="177"/>
+ <location filename="../E5Gui/E5ErrorMessage.py" line="178"/>
<source>No message handler installed.</source>
<translation type="unfinished"></translation>
</message>
@@ -15516,7 +15516,7 @@
<context>
<name>FindFileDialog</name>
<message>
- <location filename="../UI/FindFileDialog.py" line="550"/>
+ <location filename="../UI/FindFileDialog.py" line="553"/>
<source>Select directory</source>
<translation>Выберите каталог</translation>
</message>
@@ -15711,17 +15711,17 @@
<translation>Заменить</translation>
</message>
<message>
- <location filename="../UI/FindFileDialog.py" line="661"/>
+ <location filename="../UI/FindFileDialog.py" line="664"/>
<source>Replace in Files</source>
<translation>Заменить в файлах</translation>
</message>
<message>
- <location filename="../UI/FindFileDialog.py" line="620"/>
+ <location filename="../UI/FindFileDialog.py" line="623"/>
<source><p>Could not read the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source>
<translation><p>Не могу прочитать файл <b>{0}</b>. Пропускаю.</p><p>Причина: {1}</p></translation>
</message>
<message>
- <location filename="../UI/FindFileDialog.py" line="661"/>
+ <location filename="../UI/FindFileDialog.py" line="664"/>
<source><p>Could not save the file <b>{0}</b>. Skipping it.</p><p>Reason: {1}</p></source>
<translation><p>Не могу сохранить файл <b>{0}</b>. Пропускаю.</p><p>Причина: {1}</p></translation>
</message>
@@ -15746,27 +15746,27 @@
<translation>Приблизительно</translation>
</message>
<message>
- <location filename="../UI/FindFileDialog.py" line="688"/>
+ <location filename="../UI/FindFileDialog.py" line="691"/>
<source>Open</source>
<translation>Открыть</translation>
</message>
<message>
- <location filename="../UI/FindFileDialog.py" line="689"/>
+ <location filename="../UI/FindFileDialog.py" line="692"/>
<source>Copy Path to Clipboard</source>
<translation>Сопировать путь в буфер обмена</translation>
</message>
<message>
- <location filename="../UI/FindFileDialog.py" line="373"/>
+ <location filename="../UI/FindFileDialog.py" line="376"/>
<source>Invalid search expression</source>
<translation>Неверное выражение для поиска</translation>
</message>
<message>
- <location filename="../UI/FindFileDialog.py" line="373"/>
+ <location filename="../UI/FindFileDialog.py" line="376"/>
<source><p>The search expression is not valid.</p><p>Error: {0}</p></source>
<translation><p>Неверное выражение для поиска.</p><p>Ошибка: {0}</p></translation>
</message>
<message>
- <location filename="../UI/FindFileDialog.py" line="635"/>
+ <location filename="../UI/FindFileDialog.py" line="638"/>
<source><p>The current and the original hash of the file <b>{0}</b> are different. Skipping it.</p><p>Hash 1: {1}</p><p>Hash 2: {2}</p></source>
<translation><p>Хэш для файла <b>{0}</b> изменился. Пропускаем.</p><p>Хэш 1:{1}</p><p>Хэш 2: {2}</p></translation>
</message>
@@ -15776,13 +15776,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../UI/FindFileDialog.py" line="494"/>
+ <location filename="../UI/FindFileDialog.py" line="497"/>
<source>{0} / {1}</source>
<comment>occurrences / files</comment>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../UI/FindFileDialog.py" line="495"/>
+ <location filename="../UI/FindFileDialog.py" line="498"/>
<source>%n occurrence(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -15791,7 +15791,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../UI/FindFileDialog.py" line="495"/>
+ <location filename="../UI/FindFileDialog.py" line="498"/>
<source>%n file(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -20142,7 +20142,7 @@
<translation>Процесс hg завершился с кодом возврата {0}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1826"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1828"/>
<source>The hg process did not finish within 30s.</source>
<translation>Процесс hg не завершился в течение 30 секунд.</translation>
</message>
@@ -20207,7 +20207,7 @@
<translation>Слияние</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1587"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1589"/>
<source>Copying {0}</source>
<translation>Копирование {0}</translation>
</message>
@@ -20222,12 +20222,12 @@
<translation type="obsolete">Задайте количество элементов для отображения.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1980"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1982"/>
<source>Pulling from a remote Mercurial repository</source>
<translation>Загрузка изменений из удалённого репозитория</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2030"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2032"/>
<source>Pushing to a remote Mercurial repository</source>
<translation>Загрузка изменений в удалённый репозиторий</translation>
</message>
@@ -20247,7 +20247,7 @@
<translation>Отмена изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1367"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1369"/>
<source>Mercurial command</source>
<translation>Mercurial команда</translation>
</message>
@@ -20262,92 +20262,92 @@
<translation type="obsolete">Введите имя ветви</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2238"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2240"/>
<source>Creating branch in the Mercurial repository</source>
<translation>Создание ветвив репозитории</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2391"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2393"/>
<source>Verifying the integrity of the Mercurial repository</source>
<translation>Проверка целостности репозитория</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2416"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2418"/>
<source>Showing the combined configuration settings</source>
<translation>Показ комбинированных настроек</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2440"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2442"/>
<source>Showing aliases for remote repositories</source>
<translation>Алиасы для удалённых репозиториев</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2464"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2466"/>
<source>Recovering from interrupted transaction</source>
<translation>Восстановление после прерванной транзакции</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2685"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2687"/>
<source>Shall the working directory be updated?</source>
<translation>Обновить рабочий каталог?</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2267"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2269"/>
<source>Showing current branch</source>
<translation>Текущая ветвь</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2617"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2619"/>
<source>Create changegroup</source>
<translation>Создать группу изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2697"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2699"/>
<source>Apply changegroups</source>
<translation>Применить группу изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2715"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2717"/>
<source>Bisect subcommand ({0}) invalid.</source>
<translation>Неправильная подкоманда ({0}) для Bisect.</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2745"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2747"/>
<source>Mercurial Bisect ({0})</source>
<translation>Mercurial Bisect ({0})</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2638"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2640"/>
<source>Preview changegroup</source>
<translation>Предпросмотр группы изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2488"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2490"/>
<source>Identifying project directory</source>
<translation>Каталог проекта</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2526"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/>
<source>Create .hgignore file</source>
<translation>Создать файл .hgignore</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2526"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2528"/>
<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="2777"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2779"/>
<source>Removing files from the Mercurial repository only</source>
<translation>Удаление файлов только из репозитория</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2574"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2576"/>
<source>Mercurial Changegroup Files (*.hg)</source>
<translation>Mercurial файлы изменений (*.hg)</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2677"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2679"/>
<source>Mercurial Changegroup Files (*.hg);;All Files (*)</source>
<translation>Mercurial файлы изменений (*.hg);;Все файлы (*)</translation>
</message>
@@ -20357,27 +20357,27 @@
<translation type="obsolete">Файлы изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2831"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2833"/>
<source>Backing out changeset</source>
<translation>Отмена изменений</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2811"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2813"/>
<source>No revision given. Aborting...</source>
<translation>Не задана ревизия. Отмена...</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2591"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2593"/>
<source><p>The Mercurial changegroup file <b>{0}</b> already exists. Overwrite it?</p></source>
<translation><p>Файл группы изменений<b>{0}</b> уже существует. Переписать?</p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2858"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2860"/>
<source>Rollback last transaction</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2851"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2853"/>
<source>Are you sure you want to rollback the last transaction?</source>
<translation type="unfinished"></translation>
</message>
@@ -20387,72 +20387,72 @@
<translation>Фиксировать изменения в репозиторий</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3509"/>
<source>Mercurial Command Server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3347"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3349"/>
<source><p>The Mercurial Command Server could not be restarted.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3507"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3509"/>
<source><p>The Mercurial Command Server could not be started.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2926"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2928"/>
<source>Import Patch</source>
<translation type="unfinished">Импортировать патч</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2973"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2975"/>
<source>Export Patches</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3020"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3022"/>
<source>Change Phase</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3073"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3075"/>
<source>Copy Changesets</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3099"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3101"/>
<source>Copy Changesets (Continue)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3216"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3218"/>
<source>Add Sub-repository</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3249"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3251"/>
<source><p>The sub-repositories file .hgsub could not be read.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3197"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3199"/>
<source><p>The sub-repositories file .hgsub already contains an entry <b>{0}</b>. Aborting...</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3268"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/>
<source><p>The sub-repositories file .hgsub could not be written to.</p><p>Reason: {0}</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3268"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3270"/>
<source>Remove Sub-repositories</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3237"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3239"/>
<source><p>The sub-repositories file .hgsub does not exist. Aborting...</p></source>
<translation type="unfinished"></translation>
</message>
@@ -20482,22 +20482,22 @@
<translation></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3134"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3136"/>
<source>Create Unversioned Archive</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/>
<source>Mercurial Side-by-Side Difference</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1896"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1898"/>
<source><p>The file <b>{0}</b> could not be read.</p></source>
<translation type="unfinished"><p>Невозможно прочитать файл: <b>{0}</b></p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1829"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1831"/>
<source>The process {0} could not be started. Ensure, that it is in the search path.</source>
<translation type="unfinished"></translation>
</message>
@@ -20507,7 +20507,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2245"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2247"/>
<source>Created new branch <{0}>.</source>
<translation type="unfinished"></translation>
</message>
@@ -20517,67 +20517,67 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2205"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2207"/>
<source>Cancelling uncommitted merge</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3615"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3617"/>
<source>Mercurial Bookmark</source>
<translation>Mercurial закладка</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/>
<source>Delete Bookmark</source>
<translation>Удалить закладку</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3633"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3635"/>
<source>Select the bookmark to be deleted:</source>
<translation>Выберите закладку, которая будет удалена:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3644"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3646"/>
<source>Delete Mercurial Bookmark</source>
<translation>Удалить Mercurial закладку</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3672"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3674"/>
<source>Rename Mercurial Bookmark</source>
<translation>Переименовать Mercurial закладку</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3705"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3707"/>
<source>Move Mercurial Bookmark</source>
<translation>Переместить Mercurial закладку</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3790"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3792"/>
<source>Pull Bookmark</source>
<translation>Тянуть закладку</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3790"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3792"/>
<source>Select the bookmark to be pulled:</source>
<translation>Выберите закладку, для перетаскивания:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3801"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3803"/>
<source>Pulling bookmark from a remote Mercurial repository</source>
<translation>Загрузка закладки из удалённого репозитория</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3825"/>
<source>Push Bookmark</source>
<translation>Протолкнуть закладку</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3823"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3825"/>
<source>Select the bookmark to be push:</source>
<translation>Выберите закладку, для проталкивания:</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3834"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3836"/>
<source>Pushing bookmark to a remote Mercurial repository</source>
<translation>Проталкивание закладки в удалённый репозиторий</translation>
</message>
@@ -20602,12 +20602,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2176"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/>
<source>Marking as 'unresolved'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2178"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2180"/>
<source>Marking as 'resolved'</source>
<translation type="unfinished"></translation>
</message>
@@ -36116,7 +36116,7 @@
<context>
<name>PasswordManager</name>
<message>
- <location filename="../Helpviewer/Passwords/PasswordManager.py" line="148"/>
+ <location filename="../Helpviewer/Passwords/PasswordManager.py" line="151"/>
<source>Saving login data</source>
<translation>Сохранение данных учётной записи</translation>
</message>
@@ -36126,63 +36126,63 @@
<translation type="obsolete"><p>Невозможно сохранить учётные данные <b>{0}</b></p><p>Причина: {1}</p></translation>
</message>
<message>
- <location filename="../Helpviewer/Passwords/PasswordManager.py" line="221"/>
+ <location filename="../Helpviewer/Passwords/PasswordManager.py" line="224"/>
<source>Loading login data</source>
<translation>Загрузка данных учётной записи</translation>
</message>
<message>
- <location filename="../Helpviewer/Passwords/PasswordManager.py" line="196"/>
+ <location filename="../Helpviewer/Passwords/PasswordManager.py" line="199"/>
<source><p>Login data could not be loaded from <b>{0}</b></p><p>Reason: {1}</p></source>
<translation><p>Невозможно загрузить учётные данные из <b>{0}</b></p><p>Причина: {1}</p></translation>
</message>
<message>
- <location filename="../Helpviewer/Passwords/PasswordManager.py" line="221"/>
+ <location filename="../Helpviewer/Passwords/PasswordManager.py" line="224"/>
<source><p>Login data could not be loaded from <b>{0}</b></p><p>Reason: Wrong input format</p></source>
<translation><p>Невозможно загрузить учётные данные из <b>{0}</b></p><p>Причина: Неправильный формат</p></translation>
</message>
<message>
- <location filename="../Helpviewer/Passwords/PasswordManager.py" line="389"/>
+ <location filename="../Helpviewer/Passwords/PasswordManager.py" line="392"/>
<source><b>Would you like to save this password?</b><br/>To review passwords you have saved and remove them, use the password management dialog of the Settings menu.</source>
<translation><b>Сохранить этот пароль?</b><br/>Для изменения сохранённых паролей используйте диалог управления паролями из меню настроек.</translation>
</message>
<message>
- <location filename="../Helpviewer/Passwords/PasswordManager.py" line="398"/>
- <source>Never for this site</source>
- <translation>Никогда для этого сайта</translation>
- </message>
- <message>
<location filename="../Helpviewer/Passwords/PasswordManager.py" line="401"/>
+ <source>Never for this site</source>
+ <translation>Никогда для этого сайта</translation>
+ </message>
+ <message>
+ <location filename="../Helpviewer/Passwords/PasswordManager.py" line="404"/>
<source>Not now</source>
<translation>Не сейчас</translation>
</message>
<message>
- <location filename="../Helpviewer/Passwords/PasswordManager.py" line="389"/>
+ <location filename="../Helpviewer/Passwords/PasswordManager.py" line="392"/>
<source>Save password</source>
<translation>Сохранить пароль</translation>
</message>
<message>
- <location filename="../Helpviewer/Passwords/PasswordManager.py" line="612"/>
+ <location filename="../Helpviewer/Passwords/PasswordManager.py" line="622"/>
<source>Re-encoding saved passwords...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Helpviewer/Passwords/PasswordManager.py" line="148"/>
+ <location filename="../Helpviewer/Passwords/PasswordManager.py" line="151"/>
<source><p>Login data could not be saved to <b>{0}</b></p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Helpviewer/Passwords/PasswordManager.py" line="170"/>
+ <location filename="../Helpviewer/Passwords/PasswordManager.py" line="173"/>
<source>Error when loading login data on line {0}, column {1}:
{2}</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Helpviewer/Passwords/PasswordManager.py" line="612"/>
+ <location filename="../Helpviewer/Passwords/PasswordManager.py" line="622"/>
<source>%v/%m Passwords</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../Helpviewer/Passwords/PasswordManager.py" line="617"/>
+ <location filename="../Helpviewer/Passwords/PasswordManager.py" line="627"/>
<source>Passwords</source>
<translation type="unfinished"></translation>
</message>
@@ -39437,12 +39437,12 @@
<message>
<location filename="../Project/Project.py" line="244"/>
<source>Qt GUI</source>
- <translation>Qt GUI</translation>
+ <translation type="obsolete">Qt GUI</translation>
</message>
<message>
<location filename="../Project/Project.py" line="245"/>
<source>Qt Console</source>
- <translation>Qt Консоль</translation>
+ <translation type="obsolete">Qt Консоль</translation>
</message>
<message>
<location filename="../Project/Project.py" line="246"/>
@@ -39504,6 +39504,16 @@
<source><p>The eric6 plugin archive file <b>{0}</b> was created successfully.</p></source>
<translation type="unfinished"><p>Подключаемый модуль <b>{0}</b> был успешно создан.</p> {6 ?} {0}?}</translation>
</message>
+ <message>
+ <location filename="../Project/Project.py" line="244"/>
+ <source>PyQt4 GUI</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../Project/Project.py" line="245"/>
+ <source>PyQt4 Console</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>ProjectBaseBrowser</name>
@@ -47124,27 +47134,27 @@
<context>
<name>SearchReplaceWidget</name>
<message>
- <location filename="../QScintilla/SearchReplaceWidget.py" line="645"/>
+ <location filename="../QScintilla/SearchReplaceWidget.py" line="647"/>
<source>'{0}' was not found.</source>
<translation>'{0}' не найдено.</translation>
</message>
<message>
- <location filename="../QScintilla/SearchReplaceWidget.py" line="767"/>
+ <location filename="../QScintilla/SearchReplaceWidget.py" line="769"/>
<source>Replaced {0} occurrences.</source>
<translation>Заменено в {0} местах.</translation>
</message>
<message>
- <location filename="../QScintilla/SearchReplaceWidget.py" line="772"/>
+ <location filename="../QScintilla/SearchReplaceWidget.py" line="774"/>
<source>Nothing replaced because '{0}' was not found.</source>
<translation>Ничего не заменено, потому что '{0}' не найдено.</translation>
</message>
<message>
- <location filename="../QScintilla/SearchReplaceWidget.py" line="144"/>
+ <location filename="../QScintilla/SearchReplaceWidget.py" line="146"/>
<source>Find Next</source>
<translation>Найти далее</translation>
</message>
<message>
- <location filename="../QScintilla/SearchReplaceWidget.py" line="152"/>
+ <location filename="../QScintilla/SearchReplaceWidget.py" line="154"/>
<source>Find Prev</source>
<translation>Найти предыдущее</translation>
</message>
@@ -47267,7 +47277,7 @@
<translation></translation>
</message>
<message>
- <location filename="../Helpviewer/SearchWidget.py" line="97"/>
+ <location filename="../Helpviewer/SearchWidget.py" line="98"/>
<source>Expression was not found.</source>
<translation>Выражение не найдено.</translation>
</message>
@@ -47277,7 +47287,7 @@
<translation>Подсвечивать всё</translation>
</message>
<message>
- <location filename="../UI/SearchWidget.py" line="182"/>
+ <location filename="../UI/SearchWidget.py" line="183"/>
<source>'{0}' was not found.</source>
<translation type="unfinished">'{0}' не найдено.</translation>
</message>
@@ -59508,7 +59518,7 @@
</message>
<message>
<location filename="../Graphics/UMLDialog.py" line="280"/>
- <source>Eric6 Graphics File (*.e5g);;All Files (*)</source>
+ <source>Eric Graphics File (*.e5g);;All Files (*)</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -67725,17 +67735,17 @@
<context>
<name>mercurial</name>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2105"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2107"/>
<source><tr><td><b>Tags</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Метки</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2115"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2117"/>
<source><tr><td><b>Branches</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Ветви</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2124"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2126"/>
<source><tr><td><b>Last author</b></td><td>{0}</td></tr>
<tr><td><b>Committed date</b></td><td>{1}</td></tr>
<tr><td><b>Committed time</b></td><td>{2}</td></tr>
@@ -67746,30 +67756,30 @@
</table></p></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2097"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2099"/>
<source><tr><td><b>Tip</b></td><td></td></tr>
</source>
<translation><tr><td><b>Tip</b></td><td></td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2100"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2102"/>
<source><tr><td><b>Changeset</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Изменения</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2120"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2122"/>
<source><tr><td><b>Parents</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Предки</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1434"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1436"/>
<source><tr><td><b>Parent #{0}</b></td><td></td></tr>
<tr><td><b>Changeset</b></td><td>{1}</td></tr></source>
<translation><tr><td><b>Предок #{0}</b></td><td></td></tr>
<tr><td><b>Изменения</b></td><td>{1}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1454"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1456"/>
<source><tr><td><b>Last author</b></td><td>{0}</td></tr>
<tr><td><b>Committed date</b></td><td>{1}</td></tr>
<tr><td><b>Committed time</b></td><td>{2}</td></tr></source>
@@ -67796,12 +67806,12 @@
{2}</translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2110"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2112"/>
<source><tr><td><b>Bookmarks</b></td><td>{0}</td></tr></source>
<translation><tr><td><b>Закладки:</b></td><td>{0}</td></tr></translation>
</message>
<message>
- <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1492"/>
+ <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="1494"/>
<source><h3>Repository information</h3>
<p><table>
<tr><td><b>Mercurial V.</b></td><td>{0}</td></tr>
