--- a/src/eric7/i18n/eric7_en.ts Mon Dec 02 11:37:38 2024 +0100 +++ b/src/eric7/i18n/eric7_en.ts Mon Dec 02 15:48:03 2024 +0100 @@ -42788,22 +42788,22 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the GPG extension</source> + <source>Select to activate the rebase extension</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>GPG</source> + <source>Rebase</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the histedit extension</source> + <source>Select to activate the queues extension</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Histedit</source> + <source>Queues</source> <translation type="unfinished" /> </message> <message> @@ -42819,22 +42819,42 @@ </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Select to activate the queues extension</source> + <source>Select to activate the histedit extension</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> + <source>Histedit</source> + <translation type="unfinished" /> + </message> + <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> + <source>Select to activate the GPG extension</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Queues</source> + <source>GPG</source> + <translation type="unfinished" /> + </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> + <source>Fastexport</source> <translation type="unfinished" /> </message> <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.ui" line="0" /> - <source>Rebase</source> + <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> @@ -43054,32 +43074,32 @@ <translation type="unfinished" /> </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 type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="519" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="476" /> <source><p>Shall the fingerprint for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished" /> </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 type="unfinished" /> </message> <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="636" /> + <location filename="../Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py" line="593" /> <source><p>Shall the minimum protocol entry for host <b>{0}</b> really be deleted?</p></source> <translation type="unfinished" /> </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 type="unfinished" /> </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 type="unfinished" /> </message> @@ -52317,8 +52337,8 @@ <translation type="unfinished" /> </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 type="unfinished" /> </message> @@ -53683,7 +53703,7 @@ <message> <location filename="../MicroPython/MicroPythonWidget.py" line="313" /> <source>{0} (0x{1:04x}/0x{2:04x})</source> - <comment>description, VId, PId</comment> + <comment>description, VID, PID</comment> <translation type="unfinished" /> </message> <message> @@ -66819,72 +66839,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><b>Purge Ignored Files</b><p>This deletes ignored files and directories.</p></source> <translation type="unfinished" /> </message> <message> + <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="109" /> + <source>List Files to be Purged</source> + <translation type="unfinished" /> + </message> + <message> <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="111" /> - <source>List Files to be Purged</source> - <translation type="unfinished" /> - </message> - <message> - <location filename="../Plugins/VcsPlugins/vcsMercurial/PurgeBuiltin/ProjectHelper.py" line="113" /> <source>List Files to be Purged...</source> <translation type="unfinished" /> </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><b>List Files to be Purged</b><p>This lists not version controlled files and directories. These would be deleted by the "Purge Files" menu entry.</p></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 type="unfinished" /> </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 type="unfinished" /> </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><b>List All Files to be Purged</b><p>This lists not version controlled files and directories including ignored ones. These would be deleted by the "Purge All Files" menu entry.</p></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><b>List Ignored Files to be Purged</b><p>This lists ignored files and directories. These would be deleted by the "Purge Ignored Files" menu entry.</p></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 type="unfinished" /> </message>