Mercurial Repositories > eric / file diff

--- a/eric6/i18n/eric6_ru.ts	Tue Feb 04 19:43:37 2020 +0100
+++ b/eric6/i18n/eric6_ru.ts	Thu Feb 06 19:19:19 2020 +0100
@@ -28008,72 +28008,72 @@
         <translation>Mercurial: Фиксация изменений в репозитории</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/>
         <source>Mercurial Command Server</source>
         <translation>Mercurial: Сервер команд</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3246"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3248"/>
         <source>&lt;p&gt;The Mercurial Command Server could not be restarted.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Mercurial: Невозможно перезапустить сервер.&lt;br&gt;Причина: {0}.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3395"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3397"/>
         <source>&lt;p&gt;The Mercurial Command Server could not be started.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Mercurial: Невозможно запустить сервер.&lt;br&gt;Причина: {0}.&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2735"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2737"/>
         <source>Import Patch</source>
         <translation>Импорт патча</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2787"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2789"/>
         <source>Export Patches</source>
         <translation>Экспорт патчей</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2834"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2836"/>
         <source>Change Phase</source>
         <translation>Изменить фазу</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2891"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2893"/>
         <source>Copy Changesets</source>
         <translation>Копировать набор изменений</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2940"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2942"/>
         <source>Copy Changesets (Continue)</source>
         <translation>Копировать набор изменений (Continue)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3098"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3100"/>
         <source>Add Sub-repository</source>
         <translation>Добавить субрепозиторий</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3131"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3133"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub could not be read.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно прочитать файл субрепозиториев .hgsub.&lt;b&gt;&lt;/b&gt;Причина {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3079"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3081"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub already contains an entry &lt;b&gt;{0}&lt;/b&gt;. Aborting...&lt;/p&gt;</source>
         <translation>&lt;p&gt;Файл субрепозиториев .hgsub уже содержит запись &lt;b&gt;{0}&lt;/b&gt;. Отмена...&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub could not be written to.&lt;/p&gt;&lt;p&gt;Reason: {0}&lt;/p&gt;</source>
         <translation>&lt;p&gt;Невозможно записать файл субрепозиториев .hgsub.&lt;p&gt;&lt;p&gt;Причина: {0}&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3151"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3153"/>
         <source>Remove Sub-repositories</source>
         <translation>Удалить субрепозитории</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3119"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3121"/>
         <source>&lt;p&gt;The sub-repositories file .hgsub does not exist. Aborting...&lt;/p&gt;</source>
         <translation>&lt;p&gt;Отсутствует файл субрепозиториев .hgsub. Отмена...&lt;/p&gt;</translation>
     </message>
@@ -28103,7 +28103,7 @@
         <translation>Вы действительно хотите вернуть все изменения в проекте?</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2995"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2997"/>
         <source>Create Unversioned Archive</source>
         <translation>Создать неверсированный архив</translation>
     </message>
@@ -28133,62 +28133,62 @@
         <translation>Конечная ревизия текущей ветви</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3522"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3524"/>
         <source>Mercurial Bookmark</source>
         <translation>Mercurial: Закладка</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/>
         <source>Delete Bookmark</source>
         <translation>Удалить закладку</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3544"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3546"/>
         <source>Select the bookmark to be deleted:</source>
         <translation>Выберите закладку для удаления:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3555"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3557"/>
         <source>Delete Mercurial Bookmark</source>
         <translation>Mercurial: Удалить закладку</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3588"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3590"/>
         <source>Rename Mercurial Bookmark</source>
         <translation>Mercurial: Переименовать закладку</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3630"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3632"/>
         <source>Move Mercurial Bookmark</source>
         <translation>Mercurial: Переместить закладку</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/>
         <source>Pull Bookmark</source>
         <translation>Затянуть закладку</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3724"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3726"/>
         <source>Select the bookmark to be pulled:</source>
         <translation>Выберите закладку для затягивания:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3736"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3738"/>
         <source>Pulling bookmark from a remote Mercurial repository</source>
         <translation>Затянуть закладку из удалённого Mercurial репозитория</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/>
         <source>Push Bookmark</source>
         <translation>Протолкнуть закладку</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3768"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3770"/>
         <source>Select the bookmark to be push:</source>
         <translation>Выберите закладку для проталкивания:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3780"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3782"/>
         <source>Pushing bookmark to a remote Mercurial repository</source>
         <translation>Mercurial: Проталкивание закладки в удалённый репозиторий</translation>
     </message>
@@ -28223,22 +28223,22 @@
         <translation>Помеченные как &apos;resolved&apos;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/>
         <source>Delete All Backups</source>
         <translation>Удалить все резервные копии</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3012"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="3014"/>
         <source>&lt;p&gt;Do you really want to delete all backup bundles stored the backup area &lt;b&gt;{0}&lt;/b&gt;?&lt;/p&gt;</source>
         <translation>&lt;p&gt;Вы действительно хотите удалить все резервные комплекты, сохраненные в &apos;области резервного копирования&apos;&lt;b&gt;{0}&lt;/b&gt;?&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2952"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2954"/>
         <source>Copy Changesets (Stop)</source>
         <translation>Копировать набор изменений (Stop)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2965"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/hg.py" line="2967"/>
         <source>Copy Changesets (Abort)</source>
         <translation>Копировать набор изменений (Abort)</translation>
     </message>
@@ -30259,40 +30259,50 @@
         <translation>Введите опционально автора фиксации</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="122"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="132"/>
         <source>Strip Count:</source>
         <translation>Счетчик удалений:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="131"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="141"/>
         <source>Enter number of leading directories to strip off (default 1)</source>
         <translation>Число ведущих директорий для удаления (по умолчанию 1)</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="162"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="172"/>
         <source>Patch File:</source>
         <translation>Файл патча:</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="178"/>
-        <source>Enter the name of the patch file</source>
-        <translation>Введите имя файла патча</translation>
-    </message>
-    <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="185"/>
-        <source>Select to enforce the import</source>
-        <translation>Разрешить применение импорта</translation>
-    </message>
-    <message>
         <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="188"/>
+        <source>Enter the name of the patch file</source>
+        <translation>Введите имя файла патча</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="195"/>
+        <source>Select to enforce the import</source>
+        <translation>Разрешить применение импорта</translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="198"/>
         <source>Enforce Import</source>
         <translation>Применять импорт</translation>
     </message>
     <message>
-        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="33"/>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.py" line="36"/>
         <source>Patch Files (*.diff *.patch);;All Files (*)</source>
         <translation>Файлы патчей (*.diff *.patch);;Все файлы (*)</translation>
     </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="119"/>
+        <source>Enable to commit with the secret phase</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/VcsPlugins/vcsMercurial/HgImportDialog.ui" line="122"/>
+        <source>Commit with Secret Phase</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>HgLogBrowserDialog</name>
@@ -61262,22 +61272,22 @@
         <translation>{0} on {1}, {2}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1024"/>
+        <location filename="../QScintilla/Shell.py" line="1030"/>
         <source>StdOut: {0}</source>
         <translation>StdOut: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1032"/>
+        <location filename="../QScintilla/Shell.py" line="1038"/>
         <source>StdErr: {0}</source>
         <translation>StdErr: {0}</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2147"/>
+        <location filename="../QScintilla/Shell.py" line="2157"/>
         <source>Drop Error</source>
         <translation>Ошибка Drag&amp;&amp;Drop</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2147"/>
+        <location filename="../QScintilla/Shell.py" line="2157"/>
         <source>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; is not a file.&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;{0}&lt;/b&gt; не является файлом&lt;/p&gt;</translation>
     </message>
@@ -61328,7 +61338,7 @@
 Функция: {3}({4})</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="2005"/>
+        <location filename="../QScintilla/Shell.py" line="2015"/>
         <source>Project</source>
         <translation>Проект</translation>
     </message>
@@ -61358,7 +61368,7 @@
         <translation>Активное виртуальное окружение</translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1825"/>
+        <location filename="../QScintilla/Shell.py" line="1835"/>
         <source>Available Virtual Environments:
 {0}
 </source>
@@ -61367,7 +61377,7 @@
 </translation>
     </message>
     <message>
-        <location filename="../QScintilla/Shell.py" line="1866"/>
+        <location filename="../QScintilla/Shell.py" line="1876"/>
         <source>Current Virtual Environment: &apos;{0}&apos;
 </source>
         <translation>Текущее виртуальное окружение: &apos;{0}&apos;
@@ -83317,12 +83327,12 @@
         <translation> сек</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="170"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
         <source>Suspicuous URL detected</source>
         <translation>Обнаружен подозрительный URL</translation>
     </message>
     <message>
-        <location filename="../WebBrowser/WebBrowserPage.py" line="170"/>
+        <location filename="../WebBrowser/WebBrowserPage.py" line="171"/>
         <source>&lt;p&gt;The URL &lt;b&gt;{0}&lt;/b&gt; was found in the Safe Browsing database.&lt;/p&gt;{1}</source>
         <translation>&lt;p&gt;URL &lt;b&gt;{0}&lt;/b&gt; был найден в базе Safe Browsing.&lt;/p&gt;{1}</translation>
     </message>
@@ -86596,12 +86606,12 @@
 <context>
     <name>eric6</name>
     <message>
-        <location filename="../eric6.py" line="387"/>
+        <location filename="../eric6.py" line="390"/>
         <source>Starting...</source>
         <translation>Запуск...</translation>
     </message>
     <message>
-        <location filename="../eric6.py" line="392"/>
+        <location filename="../eric6.py" line="395"/>
         <source>Generating Main Window...</source>
         <translation>Создание главного окна...</translation>
     </message>
@@ -86768,7 +86778,7 @@
         <translation>Определены синтаксические ошибки в doctest.</translation>
     </message>
     <message>
-        <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="138"/>
+        <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="183"/>
         <source>no message defined for code &apos;{0}&apos;</source>
         <translation>нет сообщения, определенного для кода &apos;{0}&apos;</translation>
     </message>
@@ -86877,6 +86887,81 @@
         <source>use ==/!= to compare str, bytes, and int literals</source>
         <translation>используйте == /! = для сравнения str, bytes, и int литералов</translation>
     </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="120"/>
+        <source>f-string is missing placeholders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="123"/>
+        <source>&apos;...&apos;.format(...) has unused arguments at position(s): {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="126"/>
+        <source>&apos;...&apos;.format(...) has unused named argument(s): {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="129"/>
+        <source>&apos;...&apos;.format(...) is missing argument(s) for placeholder(s): {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="132"/>
+        <source>&apos;...&apos;.format(...) mixes automatic and manual numbering</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="135"/>
+        <source>&apos;...&apos;.format(...) has invalid format string: {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="138"/>
+        <source>&apos;...&apos; % ... has invalid format string: {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="141"/>
+        <source>&apos;...&apos; % ... has mixed positional and named placeholders</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="144"/>
+        <source>&apos;...&apos; % ... has unsupported format character {0!r}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="147"/>
+        <source>&apos;...&apos; % ... has {0!d} placeholder(s) but {1!d} substitution(s)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="150"/>
+        <source>&apos;...&apos; % ... has unused named argument(s): {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="153"/>
+        <source>&apos;...&apos; % ... is missing argument(s) for placeholder(s): {0}</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="156"/>
+        <source>&apos;...&apos; % ... expected mapping but got sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="159"/>
+        <source>&apos;...&apos; % ... expected sequence but got mapping</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../Plugins/CheckerPlugins/SyntaxChecker/pyflakes/translations.py" line="162"/>
+        <source>&apos;...&apos; % ... `*` specifier requires sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>pycodestyle</name>