Mercurial Repositories > eric / file diff

--- a/src/eric7/i18n/eric7_ru.ts	Mon Dec 02 11:37:38 2024 +0100
+++ b/src/eric7/i18n/eric7_ru.ts	Mon Dec 02 15:48:03 2024 +0100
@@ -43140,23 +43140,23 @@
     </message>
     <message>
       <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" />
-      <source>Select to activate the GPG extension</source>
-      <translation>Активировать плагин GPG</translation>
+      <source>Select to activate the rebase extension</source>
+      <translation>Активировать плагин Rebase</translation>
     </message>
     <message>
       <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" />
-      <source>GPG</source>
-      <translation>GPG</translation>
+      <source>Rebase</source>
+      <translation>Rebase</translation>
     </message>
     <message>
       <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" />
-      <source>Select to activate the histedit extension</source>
-      <translation>Активировать плагин Histedit</translation>
+      <source>Select to activate the queues extension</source>
+      <translation>Активировать плагин Queues</translation>
     </message>
     <message>
       <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" />
-      <source>Histedit</source>
-      <translation>Histedit</translation>
+      <source>Queues</source>
+      <translation>Queues</translation>
     </message>
     <message>
       <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" />
@@ -43171,23 +43171,43 @@
     </message>
     <message>
       <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" />
-      <source>Select to activate the queues extension</source>
-      <translation>Активировать плагин Queues</translation>
+      <source>Select to activate the histedit extension</source>
+      <translation>Активировать плагин Histedit</translation>
+    </message>
+    <message>
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" />
+      <source>Histedit</source>
+      <translation>Histedit</translation>
+    </message>
+    <message>
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" />
+      <source>Select to activate the GPG extension</source>
+      <translation>Активировать плагин GPG</translation>
     </message>
     <message>
       <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" />
-      <source>Queues</source>
-      <translation>Queues</translation>
+      <source>GPG</source>
+      <translation>GPG</translation>
+    </message>
+    <message>
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" />
+      <source>Select to activate the fastexport extension</source>
+      <translation type="unfinished" />
     </message>
     <message>
       <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" />
-      <source>Select to activate the rebase extension</source>
-      <translation>Активировать плагин Rebase</translation>
+      <source>Fastexport</source>
+      <translation type="unfinished" />
     </message>
     <message>
       <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" />
-      <source>Rebase</source>
-      <translation>Rebase</translation>
+      <source>Select to activate the uncommit extension</source>
+      <translation type="unfinished" />
+    </message>
+    <message>
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" />
+      <source>Uncommit</source>
+      <translation type="unfinished" />
     </message>
     <message>
       <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" />
@@ -43406,32 +43426,32 @@
       <translation>По умолчанию</translation>
     </message>
     <message>
-      <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="518" />
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="475" />
       <source>Delete Host Fingerprint</source>
       <translation>Удалить отпечаток хоста</translation>
     </message>
     <message>
-      <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="519" />
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="476" />
       <source>&lt;p&gt;Shall the fingerprint for host &lt;b&gt;{0}&lt;/b&gt; really be deleted?&lt;/p&gt;</source>
       <translation>&lt;p&gt;Действительно ли отпечаток хоста &lt;b&gt;{0}&lt;/b&gt; должен быть удален?&lt;/p&gt;</translation>
     </message>
     <message>
-      <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="635" />
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="592" />
       <source>Delete Host Minimum Protocol</source>
       <translation>Удалить минимальную версию протокола</translation>
     </message>
     <message>
-      <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="636" />
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="593" />
       <source>&lt;p&gt;Shall the minimum protocol entry for host &lt;b&gt;{0}&lt;/b&gt; really be deleted?&lt;/p&gt;</source>
       <translation>&lt;p&gt;Действительно ли запись о минимальной версии протокола хоста &lt;b&gt;{0}&lt;/b&gt; должна быть удалена?&lt;/p&gt;</translation>
     </message>
     <message>
-      <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="699" />
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="656" />
       <source>Edit User Configuration</source>
       <translation>Правка конфигурации пользователя</translation>
     </message>
     <message>
-      <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="700" />
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="657" />
       <source>You will loose all changes made in this dialog. Shall the data be saved first?</source>
       <translation>Вы можете потерять все изменения, сделанные в данном диалоге. Может сначала сохранить все данные?</translation>
     </message>
@@ -52719,8 +52739,8 @@
       <translation>на базе RP2040/RP2350</translation>
     </message>
     <message>
-      <location filename="../MicroPython/Devices/__init__.py" line="581" />
-      <location filename="../MicroPython/Devices/__init__.py" line="570" />
+      <location filename="../MicroPython/Devices/__init__.py" line="582" />
+      <location filename="../MicroPython/Devices/__init__.py" line="571" />
       <source>Unknown Device</source>
       <translation>Неизвестное устройство</translation>
     </message>
@@ -54090,8 +54110,8 @@
     <message>
       <location filename="../MicroPython/MicroPythonWidget.py" line="313" />
       <source>{0} (0x{1:04x}/0x{2:04x})</source>
-      <comment>description, VId, PId</comment>
-      <translation>{0} (0x{1:04x}/0x{2:04x})</translation>
+      <comment>description, VID, PID</comment>
+      <translation type="unfinished">{0} (0x{1:04x}/0x{2:04x})</translation>
     </message>
     <message>
       <location filename="../MicroPython/MicroPythonWidget.py" line="330" />
@@ -54472,6 +54492,11 @@
       <source>Enter the packages to be installed separated by whitespace:</source>
       <translation>Введите через пробел пакеты для установки:</translation>
     </message>
+    <message>
+      <source>{0} (0x{1:04x}/0x{2:04x})</source>
+      <comment>description, VId, PId</comment>
+      <translation type="vanished">{0} (0x{1:04x}/0x{2:04x})</translation>
+    </message>
   </context>
   <context>
     <name>MicroPythonWindow</name>
@@ -67296,72 +67321,72 @@
       <translation type="unfinished" />
     </message>
     <message>
-      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="102" />
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="100" />
       <source>&lt;b&gt;Purge Ignored Files&lt;/b&gt;&lt;p&gt;This deletes ignored files and directories.&lt;/p&gt;</source>
       <translation type="unfinished" />
     </message>
     <message>
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="109" />
+      <source>List Files to be Purged</source>
+      <translation>Список файлов для зачистки</translation>
+    </message>
+    <message>
       <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="111" />
-      <source>List Files to be Purged</source>
-      <translation>Список файлов для зачистки</translation>
-    </message>
-    <message>
-      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="113" />
       <source>List Files to be Purged...</source>
       <translation>Список файлов для зачистки...</translation>
     </message>
     <message>
-      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="120" />
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="118" />
       <source>List not version controlled files and directories</source>
       <translation type="unfinished" />
     </message>
     <message>
-      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="123" />
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="121" />
       <source>&lt;b&gt;List Files to be Purged&lt;/b&gt;&lt;p&gt;This lists not version controlled files and directories. These would be deleted by the "Purge Files" menu entry.&lt;/p&gt;</source>
       <translation type="unfinished" />
     </message>
     <message>
-      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="133" />
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="131" />
       <source>List All Files to be Purged</source>
       <translation>Список всех файлов для зачистки</translation>
     </message>
     <message>
-      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="134" />
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="132" />
       <source>List All Files to be Purged...</source>
       <translation>Список всех файлов для зачистки...</translation>
     </message>
     <message>
-      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="141" />
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="139" />
       <source>List not version controlled files and directories including ignored ones</source>
       <translation type="unfinished" />
     </message>
     <message>
-      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="147" />
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="145" />
       <source>&lt;b&gt;List All Files to be Purged&lt;/b&gt;&lt;p&gt;This lists not version controlled files and directories including ignored ones. These would be deleted by the "Purge All Files" menu entry.&lt;/p&gt;</source>
       <translation type="unfinished" />
     </message>
     <message>
-      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="158" />
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="156" />
       <source>List Ignored Files to be Purged</source>
       <translation type="unfinished" />
     </message>
     <message>
-      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="159" />
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="157" />
       <source>List Ignored Files to be Purged...</source>
       <translation type="unfinished" />
     </message>
     <message>
-      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="166" />
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="164" />
       <source>List ignored files and directories</source>
       <translation type="unfinished" />
     </message>
     <message>
-      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="169" />
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="167" />
       <source>&lt;b&gt;List Ignored Files to be Purged&lt;/b&gt;&lt;p&gt;This lists ignored files and directories. These would be deleted by the "Purge Ignored Files" menu entry.&lt;/p&gt;</source>
       <translation type="unfinished" />
     </message>
     <message>
-      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="208" />
+      <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="206" />
       <source>Purge</source>
       <translation>Purge (зачистка)</translation>
     </message>